From: Alan Cox <alan@xxxxxxxxxxxxxxx> atomic_long != atomic Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx> Cc: Evgeniy Polyakov <zbr@xxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx> --- drivers/staging/pohmelfs/inode.c | 2 +- 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 d004a9d..0b58f10 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 5f312c9..bdaab69 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", -- 1.6.4.2 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel