projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v3.10/topic/misc' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
fs
/
nfs
/
nfs4filelayout.c
diff --git
a/fs/nfs/nfs4filelayout.c
b/fs/nfs/nfs4filelayout.c
index 22d10623f5ee3b591de10631044cf90cef4d353a..b039f7f26d95c00b9c28bc908ab5976338c1157a 100644
(file)
--- 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