diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-04-01 21:14:04 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-04-01 21:14:04 +0200 |
commit | 5679027e74126e0dfc860869b0e7ceab1dd06318 (patch) | |
tree | 9a18b1a2f53be3bad8c9e4db01617fb51f067f64 /fs/ceph/snap.c | |
parent | ccd0d44fad38dc1bb4b26dcc7a30e9f2c3b36870 (diff) | |
parent | a4dd99250dc49031e6a92a895dbcc230a4832083 (diff) | |
download | linux-5679027e74126e0dfc860869b0e7ceab1dd06318.tar.bz2 |
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/urgent
Diffstat (limited to 'fs/ceph/snap.c')
-rw-r--r-- | fs/ceph/snap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c index f40b9139e437..0aee66b92af3 100644 --- a/fs/ceph/snap.c +++ b/fs/ceph/snap.c @@ -463,8 +463,8 @@ void ceph_queue_cap_snap(struct ceph_inode_info *ci) dout("queue_cap_snap %p cap_snap %p queuing under %p\n", inode, capsnap, snapc); - igrab(inode); - + ihold(inode); + atomic_set(&capsnap->nref, 1); capsnap->ci = ci; INIT_LIST_HEAD(&capsnap->ci_item); |