From: Alan Cox Date: Wed, 19 Aug 2009 16:52:02 +0000 (+0100) Subject: Staging: pohmelfs: fix atomic type spew X-Git-Tag: MMI-PSA29.97-13-9~26941^2~81 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=76efa5e34ed81587e26e483a624dc7f72efb389a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Staging: pohmelfs: fix atomic type spew atomic_long != atomic Signed-off-by: Alan Cox Cc: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman --- 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) 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 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) 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",