diff options
author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-05-29 20:06:55 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-06 18:54:14 -0700 |
commit | f1631672d6cbf0d836a4eb3617a26add4281d4a3 (patch) | |
tree | 7ecb0dc36f07c6c813efa27279f231d652b5bf04 /fs/nfs | |
parent | 44f694330e1eb6f52ab163d87c176469b9da0e94 (diff) | |
download | linux-3.10-f1631672d6cbf0d836a4eb3617a26add4281d4a3.tar.gz linux-3.10-f1631672d6cbf0d836a4eb3617a26add4281d4a3.tar.bz2 linux-3.10-f1631672d6cbf0d836a4eb3617a26add4281d4a3.zip |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/nfs')
-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 22d10623f5e..b039f7f26d9 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c @@ -1300,7 +1300,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 |