diff --git a/[refs] b/[refs]
index 60f6821b2ec9..21a699ff9a92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a221953ed121692aa25998451a57c7f4be8b4f6
+refs/heads/master: 26d83dedf61d26d85f10bc34b92f4de7660fd746
diff --git a/trunk/fs/gfs2/inode.c b/trunk/fs/gfs2/inode.c
index 57c43ac47925..d470e5286ecd 100644
--- a/trunk/fs/gfs2/inode.c
+++ b/trunk/fs/gfs2/inode.c
@@ -157,6 +157,9 @@ struct inode *gfs2_inode_lookup(struct super_block *sb, struct gfs2_inum *inum,
 	struct gfs2_glock *io_gl;
 	int error;
 
+	if (!inode)
+		return ERR_PTR(-ENOBUFS);
+
 	if (inode->i_state & I_NEW) {
 		struct gfs2_sbd *sdp = GFS2_SB(inode);
 		umode_t mode = DT2IF(type);