Setting this correctly also simplifies the call to layout_return.
Signed-off-by: Fred Isaman <iisaman@xxxxxxxxxx>
---
fs/nfs/pnfs.c | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index edffee3..56d2932 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -731,7 +731,6 @@ pnfs_return_layout_barrier(struct nfs_inode *nfsi,
static int
return_layout(struct inode *ino, struct nfs4_pnfs_layout_segment *range,
- const nfs4_stateid *stateid, /* optional */
enum pnfs_layoutreturn_type type, struct pnfs_layout_type *lo,
bool wait)
{
@@ -755,10 +754,7 @@ return_layout(struct inode *ino, struct nfs4_pnfs_layout_segment *range,
lrp->args.lseg = *range;
lrp->args.inode = ino;
lrp->lo = lo;
- if (stateid)
- lrp->args.stateid = *stateid;
- else if (lo)
- pnfs_get_layout_stateid(&lrp->args.stateid, lo);
+ pnfs_get_layout_stateid(&lrp->args.stateid, lo);
status = pnfs4_proc_layoutreturn(lrp, wait);
out:
@@ -830,9 +826,8 @@ _pnfs_return_layout(struct inode *ino, struct nfs4_pnfs_layout_segment *range,
}
}
- if (stateid && wait)
- status = return_layout(ino, &arg, stateid, type,
- lo, wait);
+ if (!stateid)
+ status = return_layout(ino, &arg, type, lo, wait);
else
pnfs_layout_release(lo, &arg);
}
--
1.6.6.1
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
