diff --git a/[refs] b/[refs] index 98a2c8089a35..07bce6a946fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e11b05d31f21f0ea39ea288af667887cd6c21c80 +refs/heads/master: b8cd952b51034ad9f20ca147507ee68dc641c98c diff --git a/trunk/fs/ceph/inode.c b/trunk/fs/ceph/inode.c index 87fb132fb330..f556e76c72e3 100644 --- a/trunk/fs/ceph/inode.c +++ b/trunk/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);