summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Isaman <iisaman@netapp.com>2012-04-24 20:50:34 +0200
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-04-27 20:10:39 +0200
commitdf0117481cd94dbb8970f4be9d05b0568fa09ab1 (patch)
tree8de0587b5e1be30510925392577e0ad8aac32bc4
parentNFS: rewrite directio write to use async coalesce code (diff)
downloadlinux-df0117481cd94dbb8970f4be9d05b0568fa09ab1.tar.xz
linux-df0117481cd94dbb8970f4be9d05b0568fa09ab1.zip
NFS: Prevent garbage cinfo->ds from leaking out
This is a bugfix that applies on top of the previous directio patches, that fixes a bug introduced in "NFS: create struct nfs_commit_info". Signed-off-by: Fred Isaman <iisaman@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/nfs4filelayout.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index 806a55f513d9..80a63f6d9e14 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/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 = {