From 873c72c7ad445cc9b1064c568348f969a1d31c6f Mon Sep 17 00:00:00 2001
From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Tue, 13 Dec 2011 09:56:30 -0800
Subject: [PATCH] --- yaml --- r: 284445 b: refs/heads/master c:
 b8cd952b51034ad9f20ca147507ee68dc641c98c h: refs/heads/master i:   284443:
 da2334252d67eaf31907ec213ccb813b2a6fdc75 v: v3

---
 [refs]                | 2 +-
 trunk/fs/ceph/inode.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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);