summaryrefslogtreecommitdiff
path: root/fs/ceph/snap.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-04-09 10:05:30 +0200
committerTakashi Iwai <tiwai@suse.de>2011-04-09 10:05:30 +0200
commit664cee46e755b37204f1731cb8726db610f3486d (patch)
tree11ed0d43eff14123534785cf25c0a2143e134e7e /fs/ceph/snap.c
parenta0334c50bf0ba7c720ed00f931e721c989efd233 (diff)
parent4e29402fe4b2006c994eed5020c42b2cc87d9b42 (diff)
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'fs/ceph/snap.c')
-rw-r--r--fs/ceph/snap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c
index f40b9139e43..0aee66b92af 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);