2 files changed, 2 insertions, 1 deletions

diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 7d8d7a47f771..3c3ff633dd17 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -2012,7 +2012,7 @@ encode_layoutreturn(struct xdr_stream *xdr,
         p = reserve_space(xdr, 16);
         *p++ = cpu_to_be32(0);          /* reclaim. always 0 for now */
         *p++ = cpu_to_be32(args->layout_type);
-        *p++ = cpu_to_be32(IOMODE_ANY);
+        *p++ = cpu_to_be32(args->iomode);
         *p = cpu_to_be32(RETURN_FILE);
         p = reserve_space(xdr, 16);
         p = xdr_encode_hyper(p, 0);
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 7e1bac189d1c..1b544c1a746c 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -914,6 +914,7 @@ _pnfs_return_layout(struct inode *ino)
         lrp->args.stateid = stateid;
         lrp->args.layout_type = NFS_SERVER(ino)->pnfs_curr_ld->id;
         lrp->args.inode = ino;
+        lrp->args.iomode = IOMODE_ANY;
         lrp->args.layout = lo;
         lrp->clp = NFS_SERVER(ino)->nfs_client;
         lrp->cred = lo->plh_lc_cred;