diff options
author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-05-29 20:06:55 -0400 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-05-29 20:15:32 -0400 |
commit | 6df200f5d5191bdde4d2e408215383890f956781 (patch) | |
tree | 2fe5f8914a6356fd317615e4808ed63cc8efe564 | |
parent | c8e470280a5c875468dd4eb41d8c4b44c87ebbcf (diff) |
pNFS: Handle allocation errors correctly in filelayout_alloc_layout_hdr()
Return the NULL pointer when the allocation fails.
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Cc: <stable@vger.kernel.org> # 3.5.x
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-rw-r--r-- | fs/nfs/nfs4filelayout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index 63a16375660a..21e921147d21 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c | |||
@@ -1348,7 +1348,7 @@ filelayout_alloc_layout_hdr(struct inode *inode, gfp_t gfp_flags) | |||
1348 | struct nfs4_filelayout *flo; | 1348 | struct nfs4_filelayout *flo; |
1349 | 1349 | ||
1350 | flo = kzalloc(sizeof(*flo), gfp_flags); | 1350 | flo = kzalloc(sizeof(*flo), gfp_flags); |
1351 | return &flo->generic_hdr; | 1351 | return flo != NULL ? &flo->generic_hdr : NULL; |
1352 | } | 1352 | } |
1353 | 1353 | ||
1354 | static void | 1354 | static void |