projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e685d23
)
pNFS: Skip checking for return-on-close if the layout is invalid
author
Trond Myklebust
<trond.myklebust@primarydata.com>
Mon, 21 Nov 2016 16:05:33 +0000
(11:05 -0500)
committer
Trond Myklebust
<trond.myklebust@primarydata.com>
Thu, 1 Dec 2016 22:21:44 +0000
(17:21 -0500)
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
fs/nfs/pnfs.c
patch
|
blob
|
history
diff --git
a/fs/nfs/pnfs.c
b/fs/nfs/pnfs.c
index a64d1e40dba955b10a05ad6bb9716e3d472db532..330f3a012f8eed29ee0a8136d21cbae23313cc8d 100644
(file)
--- a/
fs/nfs/pnfs.c
+++ b/
fs/nfs/pnfs.c
@@
-1190,7
+1190,8
@@
bool pnfs_roc(struct inode *ino)
spin_lock(&ino->i_lock);
lo = nfsi->layout;
- if (!lo || test_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags))
+ if (!lo || !pnfs_layout_is_valid(lo) ||
+ test_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags))
goto out_noroc;
/* no roc if we hold a delegation */