summaryrefslogtreecommitdiffstats
path: root/fs/ceph
diff options
context:
space:
mode:
authorYehuda Sadeh <yehuda@hq.newdream.net>2011-12-13 18:56:30 +0100
committerSage Weil <sage@newdream.net>2012-01-10 17:56:59 +0100
commitb8cd952b51034ad9f20ca147507ee68dc641c98c (patch)
tree78fe2114ab9859eecc780206cc5d423b675b7e09 /fs/ceph
parentcrush: fix force for non-root TAKE (diff)
downloadlinux-b8cd952b51034ad9f20ca147507ee68dc641c98c.tar.xz
linux-b8cd952b51034ad9f20ca147507ee68dc641c98c.zip
ceph: dereference pointer after checking for NULL
moved dereference after BUG_ON Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
Diffstat (limited to 'fs/ceph')
-rw-r--r--fs/ceph/inode.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 87fb132fb330..f556e76c72e3 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -851,11 +851,12 @@ static void ceph_set_dentry_offset(struct dentry *dn)
{
struct dentry *dir = dn->d_parent;
struct inode *inode = dir->d_inode;
- struct ceph_inode_info *ci = ceph_inode(inode);
+ struct ceph_inode_info *ci;
struct ceph_dentry_info *di;
BUG_ON(!inode);
+ ci = ceph_inode(inode);
di = ceph_dentry(dn);
spin_lock(&ci->i_ceph_lock);