diff options
author | Alan Cox <alan@linux.intel.com> | 2009-08-19 17:52:02 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:02:26 -0700 |
commit | 76efa5e34ed81587e26e483a624dc7f72efb389a (patch) | |
tree | ef62dbea69c1440a1e958d0fdb47a975cc4ae6ff /drivers | |
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>
Diffstat (limited to 'drivers')
-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 d004a9ddddb..0b58f104370 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) INIT_LIST_HEAD(&psb->crypto_active_list); atomic_set(&psb->trans_gen, 1); - atomic_set(&psb->total_inodes, 0); + atomic_long_set(&psb->total_inodes, 0); mutex_init(&psb->state_lock); INIT_LIST_HEAD(&psb->state_list); diff --git a/drivers/staging/pohmelfs/net.c b/drivers/staging/pohmelfs/net.c index 5f312c91aab..bdaab6905fd 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) printk(KERN_INFO "Mounting POHMELFS (%d) " "with extended attributes support.\n", psb->idx); - if (atomic_read(&psb->total_inodes) <= 1) + if (atomic_long_read(&psb->total_inodes) <= 1) atomic_long_set(&psb->total_inodes, cap->nr_files); dprintk("%s: total: %llu, avail: %llu, flags: %llx, inodes: %llu.\n", |