summaryrefslogtreecommitdiffstats
path: root/fs/nfs/pnfs.h
diff options
context:
space:
mode:
authorTrond Myklebust2016-01-04 17:23:52 +0100
committerTrond Myklebust2016-01-04 18:36:11 +0100
commit10335556c9e6ed2e1949fb595b7775f475299832 (patch)
tree60d446eab1bb923f44f6fa258f306639cd35d988 /fs/nfs/pnfs.h
parentNFSv4.1/pNFS: pnfs_mark_matching_lsegs_return() should set the iomode (diff)
downloadkernel-qcow2-linux-10335556c9e6ed2e1949fb595b7775f475299832.tar.gz
kernel-qcow2-linux-10335556c9e6ed2e1949fb595b7775f475299832.tar.xz
kernel-qcow2-linux-10335556c9e6ed2e1949fb595b7775f475299832.zip
NFSv4.1/pNFS: pnfs_error_mark_layout_for_return() must always return layout
Fix a bug whereby if all the layout segments could be immediately freed, the call to pnfs_error_mark_layout_for_return() would never result in a layoutreturn. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/pnfs.h')
-rw-r--r--fs/nfs/pnfs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 4bd7faf9ce50..3d0f513a4a77 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -266,7 +266,7 @@ int pnfs_choose_layoutget_stateid(nfs4_stateid *dst,
int pnfs_mark_matching_lsegs_invalid(struct pnfs_layout_hdr *lo,
struct list_head *tmp_list,
struct pnfs_layout_range *recall_range);
-void pnfs_mark_matching_lsegs_return(struct pnfs_layout_hdr *lo,
+int pnfs_mark_matching_lsegs_return(struct pnfs_layout_hdr *lo,
struct list_head *tmp_list,
struct pnfs_layout_range *recall_range);
bool pnfs_roc(struct inode *ino);