diff --git a/[refs] b/[refs]
index 01cf3b963c7b..12488dada962 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36e21687e6e51c4225c42e6291938363f7bbfa7c
+refs/heads/master: ac1f12ef569d49b013c3db86e11be7e15d66b1c3
diff --git a/trunk/fs/ceph/inode.c b/trunk/fs/ceph/inode.c
index 3e6b52cb5ee8..e7cca414da03 100644
--- a/trunk/fs/ceph/inode.c
+++ b/trunk/fs/ceph/inode.c
@@ -1230,11 +1230,11 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req,
 			in = dn->d_inode;
 		} else {
 			in = ceph_get_inode(parent->d_sb, vino);
-			if (in == NULL) {
+			if (IS_ERR(in)) {
 				dout("new_inode badness\n");
 				d_delete(dn);
 				dput(dn);
-				err = -ENOMEM;
+				err = PTR_ERR(in);
 				goto out;
 			}
 			dn = splice_dentry(dn, in, NULL);