diff options
author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-05-29 20:06:55 -0400 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2014-07-17 13:43:17 +0200 |
commit | 803e56e270ff2d90a2bf144e9c5b237e83f9f341 (patch) | |
tree | 30a0ad0184fb59484df2b2985ea52d8deaf5ac9c | |
parent | be03560faf3cfd894fd783dd8f098a8c4a4be4cb (diff) |
pNFS: Handle allocation errors correctly in filelayout_alloc_layout_hdr()
commit 6df200f5d5191bdde4d2e408215383890f956781 upstream.
Return the NULL pointer when the allocation fails.
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-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 394b0a0c54bf..3c27659aba7b 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c @@ -1330,7 +1330,7 @@ filelayout_alloc_layout_hdr(struct inode *inode, gfp_t gfp_flags) struct nfs4_filelayout *flo; flo = kzalloc(sizeof(*flo), gfp_flags); - return &flo->generic_hdr; + return flo != NULL ? &flo->generic_hdr : NULL; } static void |