From ce3eda0449ba76f9118b02057e927f0f5f8c049b Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 19 Aug 2009 17:52:02 +0100 Subject: [PATCH] --- yaml --- r: 162494 b: refs/heads/master c: 76efa5e34ed81587e26e483a624dc7f72efb389a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/pohmelfs/inode.c | 2 +- trunk/drivers/staging/pohmelfs/net.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ddc845d64cb5..e08e658f7eca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9cfa2bc2f455aa9ba1b7bd92eb6790d78c8fab4a +refs/heads/master: 76efa5e34ed81587e26e483a624dc7f72efb389a diff --git a/trunk/drivers/staging/pohmelfs/inode.c b/trunk/drivers/staging/pohmelfs/inode.c index d004a9ddddbc..0b58f1043707 100644 --- a/trunk/drivers/staging/pohmelfs/inode.c +++ b/trunk/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/trunk/drivers/staging/pohmelfs/net.c b/trunk/drivers/staging/pohmelfs/net.c index 5f312c91aab6..bdaab6905fde 100644 --- a/trunk/drivers/staging/pohmelfs/net.c +++ b/trunk/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",