From: Tom Haynes <thomas.haynes@primarydata.com>
To: Trond Myklebust <trond.myklebust@primarydata.com>
Cc: Linux NFS Mailing list <linux-nfs@vger.kernel.org>
Subject: [PATCH v5 42/51] nfs41: add range to layoutreturn args
Date: Thu, 22 Jan 2015 15:36:14 -0800 [thread overview]
Message-ID: <1421969783-92997-43-git-send-email-loghyr@primarydata.com> (raw)
In-Reply-To: <1421969783-92997-1-git-send-email-loghyr@primarydata.com>
From: Peng Tao <tao.peng@primarydata.com>
So that callers can specify which range to return.
Signed-off-by: Peng Tao <tao.peng@primarydata.com>
Signed-off-by: Tom Haynes <loghyr@primarydata.com>
---
fs/nfs/nfs4xdr.c | 6 +++---
fs/nfs/pnfs.c | 4 +++-
include/linux/nfs_xdr.h | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 3c3ff63..56d4c91 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -2012,11 +2012,11 @@ 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(args->iomode);
+ *p++ = cpu_to_be32(args->range.iomode);
*p = cpu_to_be32(RETURN_FILE);
p = reserve_space(xdr, 16);
- p = xdr_encode_hyper(p, 0);
- p = xdr_encode_hyper(p, NFS4_MAX_UINT64);
+ p = xdr_encode_hyper(p, args->range.offset);
+ p = xdr_encode_hyper(p, args->range.length);
spin_lock(&args->inode->i_lock);
encode_nfs4_stateid(xdr, &args->stateid);
spin_unlock(&args->inode->i_lock);
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 685af4f..9549b89 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -916,7 +916,9 @@ pnfs_send_layoutreturn(struct pnfs_layout_hdr *lo, nfs4_stateid stateid,
lrp->args.stateid = stateid;
lrp->args.layout_type = NFS_SERVER(ino)->pnfs_curr_ld->id;
lrp->args.inode = ino;
- lrp->args.iomode = iomode;
+ lrp->args.range.iomode = iomode;
+ lrp->args.range.offset = 0;
+ lrp->args.range.length = NFS4_MAX_UINT64;
lrp->args.layout = lo;
lrp->clp = NFS_SERVER(ino)->nfs_client;
lrp->cred = lo->plh_lc_cred;
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 6400a1e..3637923 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -293,7 +293,7 @@ struct nfs4_layoutreturn_args {
struct nfs4_sequence_args seq_args;
struct pnfs_layout_hdr *layout;
struct inode *inode;
- enum pnfs_iomode iomode;
+ struct pnfs_layout_range range;
nfs4_stateid stateid;
__u32 layout_type;
};
--
1.9.3
next prev parent reply other threads:[~2015-01-22 23:38 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-22 23:35 [PATCH v5 00/51] Add Flexfile Layout Module Tom Haynes
2015-01-22 23:35 ` [PATCH v5 01/51] pnfs: Prepare for flexfiles by pulling out common code Tom Haynes
2015-01-22 23:35 ` [PATCH v5 02/51] pnfs: Do not grab the commit_info lock twice when rescheduling writes Tom Haynes
2015-01-22 23:35 ` [PATCH v5 03/51] nfs41: pull data server cache from file layout to generic pnfs Tom Haynes
2015-01-22 23:35 ` [PATCH v5 04/51] nfs41: pull decode_ds_addr " Tom Haynes
2015-01-22 23:35 ` [PATCH v5 05/51] nfs41: pull nfs4_ds_connect " Tom Haynes
2015-01-22 23:35 ` [PATCH v5 06/51] nfs41: allow LD to choose DS connection auth flavor Tom Haynes
2015-01-22 23:35 ` [PATCH v5 07/51] nfs41: move file layout macros to generic pnfs Tom Haynes
2015-01-22 23:35 ` [PATCH v5 08/51] nfsv3: introduce nfs3_set_ds_client Tom Haynes
2015-01-22 23:35 ` [PATCH v5 09/51] nfs41: allow LD to choose DS connection version/minor_version Tom Haynes
2015-01-22 23:35 ` [PATCH v5 10/51] nfs41: create NFSv3 DS connection if specified Tom Haynes
2015-01-22 23:35 ` [PATCH v5 11/51] pnfs: Add nfs_rpc_ops in calls to nfs_initiate_pgio Tom Haynes
2015-01-22 23:35 ` [PATCH v5 12/51] nfs: allow different protocol in nfs_initiate_commit Tom Haynes
2015-01-22 23:35 ` [PATCH v5 13/51] nfs4: pass slot table to nfs40_setup_sequence Tom Haynes
2015-01-22 23:35 ` [PATCH v5 14/51] nfs4: export nfs4_sequence_done Tom Haynes
2015-01-22 23:35 ` [PATCH v5 15/51] nfs: allow to specify cred in nfs_initiate_pgio Tom Haynes
2015-01-22 23:35 ` [PATCH v5 16/51] NFSv4.1/NFSv3: Add pNFS callbacks for nfs3_(read|write|commit)_done() Tom Haynes
2015-01-22 23:35 ` [PATCH v5 17/51] sunrpc: add rpc_count_iostats_idx Tom Haynes
2015-01-22 23:35 ` [PATCH v5 18/51] nfs: set hostname when creating nfsv3 ds connection Tom Haynes
2015-01-22 23:35 ` [PATCH v5 19/51] nfs/flexclient: export pnfs_layoutcommit_inode Tom Haynes
2015-01-22 23:35 ` [PATCH v5 20/51] nfs41: close a small race window when adding new layout to global list Tom Haynes
2015-01-22 23:35 ` [PATCH v5 21/51] nfs41: serialize first layoutget of a file Tom Haynes
2015-01-22 23:35 ` [PATCH v5 22/51] nfs: save server READ/WRITE/COMMIT status Tom Haynes
2015-01-22 23:35 ` [PATCH v5 23/51] nfs41: pass iomode through layoutreturn args Tom Haynes
2015-01-22 23:35 ` [PATCH v5 24/51] nfs41: make a helper function to send layoutreturn Tom Haynes
2015-01-22 23:35 ` [PATCH v5 25/51] nfs41: add a helper to mark layout for return Tom Haynes
2015-01-22 23:35 ` [PATCH v5 26/51] nfs41: don't use a layout if it is marked for returning Tom Haynes
2015-01-22 23:35 ` [PATCH v5 27/51] nfs41: send layoutreturn in last put_lseg Tom Haynes
2015-01-22 23:36 ` [PATCH v5 28/51] nfs41: clear NFS_LAYOUT_RETURN if layoutreturn is sent or failed to send Tom Haynes
2015-01-22 23:36 ` [PATCH v5 29/51] nfs/filelayout: use pnfs_error_mark_layout_for_return Tom Haynes
2015-01-22 23:36 ` [PATCH v5 30/51] nfs: introduce pg_cleanup op for pgio descriptors Tom Haynes
2015-01-22 23:36 ` [PATCH v5 31/51] pnfs: release lseg in pnfs_generic_pg_cleanup Tom Haynes
2015-01-22 23:36 ` [PATCH v5 32/51] nfs: handle overlapping reqs in lock_and_join Tom Haynes
2015-01-22 23:36 ` [PATCH v5 33/51] nfs: rename pgio header ds_idx to ds_commit_idx Tom Haynes
2015-01-22 23:36 ` [PATCH v5 34/51] pnfs: pass ds_commit_idx through the commit path Tom Haynes
2015-01-22 23:36 ` [PATCH v5 35/51] nfs: add mirroring support to pgio layer Tom Haynes
2015-01-22 23:36 ` [PATCH v5 36/51] nfs: mirroring support for direct io Tom Haynes
2015-01-22 23:36 ` [PATCH v5 37/51] pnfs: fail comparison when bucket verifier not set Tom Haynes
2015-01-22 23:36 ` [PATCH v5 38/51] nfs41: add a debug warning if we destroy an unempty layout Tom Haynes
2015-01-22 23:36 ` [PATCH v5 39/51] nfs: only reset desc->pg_mirror_idx when mirroring is supported Tom Haynes
2015-01-22 23:36 ` [PATCH v5 40/51] nfs: add nfs_pgio_current_mirror helper Tom Haynes
2015-01-22 23:36 ` [PATCH v5 41/51] pnfs: allow LD to ask to resend read through pnfs Tom Haynes
2015-01-22 23:36 ` Tom Haynes [this message]
2015-01-22 23:36 ` [PATCH v5 43/51] nfs41: allow async version layoutreturn Tom Haynes
2015-01-22 23:36 ` [PATCH v5 44/51] nfs41: introduce NFS_LAYOUT_RETURN_BEFORE_CLOSE Tom Haynes
2015-01-22 23:36 ` [PATCH v5 45/51] nfs/flexfiles: send layoutreturn before freeing lseg Tom Haynes
2015-01-22 23:36 ` [PATCH v5 46/51] nfs41: add NFS_LAYOUT_RETRY_LAYOUTGET to layout header flags Tom Haynes
2015-01-22 23:36 ` [PATCH v5 47/51] nfs: add a helper to set NFS_ODIRECT_RESCHED_WRITES to direct writes Tom Haynes
2015-01-22 23:36 ` [PATCH v5 48/51] nfs41: wait for LAYOUTRETURN before retrying LAYOUTGET Tom Haynes
2015-01-22 23:36 ` [PATCH v5 49/51] nfs: count DIO good bytes correctly with mirroring Tom Haynes
2015-01-22 23:36 ` [PATCH v5 50/51] pnfs/flexfiles: Add the FlexFile Layout Driver Tom Haynes
2015-01-22 23:36 ` [PATCH v5 51/51] pnfs: Update documentation on the Layout Drivers Tom Haynes
2015-01-23 8:07 ` [PATCH v5 00/51] Add Flexfile Layout Module Christoph Hellwig
2015-01-23 8:27 ` Christoph Hellwig
2015-01-24 14:33 ` Hi Christoph, Peng Tao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1421969783-92997-43-git-send-email-loghyr@primarydata.com \
--to=thomas.haynes@primarydata.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@primarydata.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).