diff options
author | Alan Cox <alan@linux.intel.com> | 2009-08-19 12:52:02 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:02:26 -0400 |
commit | 76efa5e34ed81587e26e483a624dc7f72efb389a (patch) | |
tree | ef62dbea69c1440a1e958d0fdb47a975cc4ae6ff | |
parent | 9cfa2bc2f455aa9ba1b7bd92eb6790d78c8fab4a (diff) |
Staging: pohmelfs: fix atomic type spew
atomic_long != atomic
Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/pohmelfs/inode.c | 2 | ||||
-rw-r--r-- | drivers/staging/pohmelfs/net.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c index d004a9ddddbc..0b58f1043707 100644 --- a/drivers/staging/pohmelfs/inode.c +++ b/drivers/staging/pohmelfs/inode.c | |||
@@ -1865,7 +1865,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent) | |||
1865 | INIT_LIST_HEAD(&psb->crypto_active_list); | 1865 | INIT_LIST_HEAD(&psb->crypto_active_list); |
1866 | 1866 | ||
1867 | atomic_set(&psb->trans_gen, 1); | 1867 | atomic_set(&psb->trans_gen, 1); |
1868 | atomic_set(&psb->total_inodes, 0); | 1868 | atomic_long_set(&psb->total_inodes, 0); |
1869 | 1869 | ||
1870 | mutex_init(&psb->state_lock); | 1870 | mutex_init(&psb->state_lock); |
1871 | INIT_LIST_HEAD(&psb->state_list); | 1871 | INIT_LIST_HEAD(&psb->state_list); |
diff --git a/drivers/staging/pohmelfs/net.c b/drivers/staging/pohmelfs/net.c index 5f312c91aab6..bdaab6905fde 100644 --- a/drivers/staging/pohmelfs/net.c +++ b/drivers/staging/pohmelfs/net.c | |||
@@ -680,7 +680,7 @@ static int pohmelfs_root_cap_response(struct netfs_state *st) | |||
680 | printk(KERN_INFO "Mounting POHMELFS (%d) " | 680 | printk(KERN_INFO "Mounting POHMELFS (%d) " |
681 | "with extended attributes support.\n", psb->idx); | 681 | "with extended attributes support.\n", psb->idx); |
682 | 682 | ||
683 | if (atomic_read(&psb->total_inodes) <= 1) | 683 | if (atomic_long_read(&psb->total_inodes) <= 1) |
684 | atomic_long_set(&psb->total_inodes, cap->nr_files); | 684 | atomic_long_set(&psb->total_inodes, cap->nr_files); |
685 | 685 | ||
686 | dprintk("%s: total: %llu, avail: %llu, flags: %llx, inodes: %llu.\n", | 686 | dprintk("%s: total: %llu, avail: %llu, flags: %llx, inodes: %llu.\n", |