From: andros@netapp.com
To: trond.myklebust@netapp.com
Cc: linux-nfs@vger.kernel.org, Andy Adamson <andros@netapp.com>
Subject: [PATCH pNFS wave 3 Version 3 04/18] NFSv4.1: send zero stateid seqid on v4.1 i/o
Date: Mon, 28 Feb 2011 20:34:09 -0500 [thread overview]
Message-ID: <1298943263-2886-5-git-send-email-andros@netapp.com> (raw)
In-Reply-To: <1298943263-2886-4-git-send-email-andros@netapp.com>
From: Andy Adamson <andros@netapp.com>
Data servers require a zero stateid seqid, and there is no advantage to not
doing the same for all NFSv4.1
Signed-off-by: Andy Adamson <andros@netapp.com>
---
fs/nfs/nfs4xdr.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 4e2c168..2380c45 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -1384,7 +1384,7 @@ static void encode_putrootfh(struct xdr_stream *xdr, struct compound_hdr *hdr)
hdr->replen += decode_putrootfh_maxsz;
}
-static void encode_stateid(struct xdr_stream *xdr, const struct nfs_open_context *ctx, const struct nfs_lock_context *l_ctx)
+static void encode_stateid(struct xdr_stream *xdr, const struct nfs_open_context *ctx, const struct nfs_lock_context *l_ctx, int zero_seqid)
{
nfs4_stateid stateid;
__be32 *p;
@@ -1392,6 +1392,8 @@ static void encode_stateid(struct xdr_stream *xdr, const struct nfs_open_context
p = reserve_space(xdr, NFS4_STATEID_SIZE);
if (ctx->state != NULL) {
nfs4_copy_stateid(&stateid, ctx->state, l_ctx->lockowner, l_ctx->pid);
+ if (zero_seqid)
+ stateid.stateid.seqid = 0;
xdr_encode_opaque_fixed(p, stateid.data, NFS4_STATEID_SIZE);
} else
xdr_encode_opaque_fixed(p, zero_stateid.data, NFS4_STATEID_SIZE);
@@ -1404,7 +1406,8 @@ static void encode_read(struct xdr_stream *xdr, const struct nfs_readargs *args,
p = reserve_space(xdr, 4);
*p = cpu_to_be32(OP_READ);
- encode_stateid(xdr, args->context, args->lock_context);
+ encode_stateid(xdr, args->context, args->lock_context,
+ hdr->minorversion);
p = reserve_space(xdr, 12);
p = xdr_encode_hyper(p, args->offset);
@@ -1592,7 +1595,8 @@ static void encode_write(struct xdr_stream *xdr, const struct nfs_writeargs *arg
p = reserve_space(xdr, 4);
*p = cpu_to_be32(OP_WRITE);
- encode_stateid(xdr, args->context, args->lock_context);
+ encode_stateid(xdr, args->context, args->lock_context,
+ hdr->minorversion);
p = reserve_space(xdr, 16);
p = xdr_encode_hyper(p, args->offset);
--
1.6.6
next prev parent reply other threads:[~2011-03-01 17:29 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-01 1:34 [PATCH pNFS wave 3 Version 3 0/18] pNFS wave 3 submission Version 3 andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 01/18] NFSv4: remove CONFIG_NFS_V4 from nfs_read_data andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 02/18] NFSv4.1: put_layout_hdr can remove nfsi->layout andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 03/18] NFS move nfs_client initialization into nfs_get_client andros
2011-03-01 1:34 ` andros [this message]
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 05/18] NFSv4.1: new flag for state renewal check andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 06/18] NFSv4.1: new flag for lease time check andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 07/18] NFSv4.1: add MDS mount DS only check andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 08/18] NFSv4.1: lseg refcounting andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 09/18] NFSv4.1: coelesce across layout stripes andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 10/18] NFSv4.1: shift pnfs_update_layout locations andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 11/18] NFSv4.1: generic read andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 12/18] NFSv4.1: data server connection andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 13/18] NFSv4.1: filelayout i/o helpers andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 14/18] NFSv4.1: filelayout read andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 15/18] NFSv4.1: filelayout async error handler andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 16/18] NFSv4.1 move deviceid cache to filelayout driver andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 17/18] NFSv4.1: turn off pNFS on ds connection failure andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 18/18] NFSv4.1: lseg documentation andros
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=1298943263-2886-5-git-send-email-andros@netapp.com \
--to=andros@netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@netapp.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).