From 2ea46c3d84b496fb9da4471d986b9e204f36d0cb Mon Sep 17 00:00:00 2001
From: Fred Isaman <iisaman@netapp.com>
Date: Tue, 24 Apr 2012 14:50:34 -0400
Subject: [PATCH] --- yaml --- r: 308556 b: refs/heads/master c:
 df0117481cd94dbb8970f4be9d05b0568fa09ab1 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/fs/nfs/nfs4filelayout.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 88ae2f654ce4..713299d8f0d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1763da1234cba663b849476d451bdccac5147859
+refs/heads/master: df0117481cd94dbb8970f4be9d05b0568fa09ab1
diff --git a/trunk/fs/nfs/nfs4filelayout.c b/trunk/fs/nfs/nfs4filelayout.c
index 806a55f513d9..80a63f6d9e14 100644
--- a/trunk/fs/nfs/nfs4filelayout.c
+++ b/trunk/fs/nfs/nfs4filelayout.c
@@ -1184,7 +1184,12 @@ filelayout_free_layout_hdr(struct pnfs_layout_hdr *lo)
 static struct pnfs_ds_commit_info *
 filelayout_get_ds_info(struct inode *inode)
 {
-	return &FILELAYOUT_FROM_HDR(NFS_I(inode)->layout)->commit_info;
+	struct pnfs_layout_hdr *layout = NFS_I(inode)->layout;
+
+	if (layout == NULL)
+		return NULL;
+	else
+		return &FILELAYOUT_FROM_HDR(layout)->commit_info;
 }
 
 static struct pnfs_layoutdriver_type filelayout_type = {