From: "J. Bruce Fields" <bfields@fieldses.org>
To: Benny Halevy <benny@tonian.com>
Cc: " J. Bruce Fields" <bfields@redhat.com>,
linux-nfs@vger.kernel.org, Benny Halevy <bhalevy@tonian.com>,
Mi Jinlong <mijinlong@cn.fujitsu.com>
Subject: Re: [PATCH 1/7] nfsd4: implement new 4.1 open reclaim types
Date: Thu, 20 Oct 2011 08:23:34 -0400 [thread overview]
Message-ID: <20111020122334.GM5444@fieldses.org> (raw)
In-Reply-To: <1319076768-13311-1-git-send-email-benny@tonian.com>
On Wed, Oct 19, 2011 at 07:12:48PM -0700, Benny Halevy wrote:
> From: "J. Bruce Fields" <bfields@redhat.com>
>
> Signed-off-by: Benny Halevy <bhalevy@tonian.com>
> ---
> fs/nfsd/nfs4proc.c | 15 +++------------
> fs/nfsd/nfs4state.c | 10 ++++++++--
> fs/nfsd/nfs4xdr.c | 13 +++++++++++++
> include/linux/nfs4.h | 5 ++++-
> 4 files changed, 28 insertions(+), 15 deletions(-)
Adding Mi Jinlong--is there a chance you might be able to write pynfs
tests for these? I don't know if clients are using them yet so it would
be nice to know if they work before committing this.
--b.
>
> diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
> index 5b192a2..e3fffab 100644
> --- a/fs/nfsd/nfs4proc.c
> +++ b/fs/nfsd/nfs4proc.c
> @@ -366,12 +366,6 @@ static __be32 nfsd_check_obj_isreg(struct svc_fh *fh)
> switch (open->op_claim_type) {
> case NFS4_OPEN_CLAIM_DELEGATE_CUR:
> case NFS4_OPEN_CLAIM_NULL:
> - /*
> - * (1) set CURRENT_FH to the file being opened,
> - * creating it if necessary, (2) set open->op_cinfo,
> - * (3) set open->op_truncate if the file is to be
> - * truncated after opening, (4) do permission checking.
> - */
> status = do_open_lookup(rqstp, &cstate->current_fh,
> open);
> if (status)
> @@ -379,17 +373,14 @@ static __be32 nfsd_check_obj_isreg(struct svc_fh *fh)
> break;
> case NFS4_OPEN_CLAIM_PREVIOUS:
> open->op_openowner->oo_flags |= NFS4_OO_CONFIRMED;
> - /*
> - * The CURRENT_FH is already set to the file being
> - * opened. (1) set open->op_cinfo, (2) set
> - * open->op_truncate if the file is to be truncated
> - * after opening, (3) do permission checking.
> - */
> + case NFS4_OPEN_CLAIM_FH:
> + case NFS4_OPEN_CLAIM_DELEG_CUR_FH:
> status = do_open_fhandle(rqstp, &cstate->current_fh,
> open);
> if (status)
> goto out;
> break;
> + case NFS4_OPEN_CLAIM_DELEG_PREV_FH:
> case NFS4_OPEN_CLAIM_DELEGATE_PREV:
> open->op_openowner->oo_flags |= NFS4_OO_CONFIRMED;
> dprintk("NFSD: unsupported OPEN claim type %d\n",
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 62aa91a..7da0748 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -2562,6 +2562,12 @@ static int share_access_to_flags(u32 share_access)
> return delegstateid(ret);
> }
>
> +static bool nfsd4_is_deleg_cur(struct nfsd4_open *open)
> +{
> + return open->op_claim_type == NFS4_OPEN_CLAIM_DELEGATE_CUR ||
> + open->op_claim_type == NFS4_OPEN_CLAIM_DELEG_CUR_FH;
> +}
> +
> static __be32
> nfs4_check_deleg(struct nfs4_client *cl, struct nfs4_file *fp, struct nfsd4_open *open,
> struct nfs4_delegation **dp)
> @@ -2577,7 +2583,7 @@ static int share_access_to_flags(u32 share_access)
> if (status)
> *dp = NULL;
> out:
> - if (open->op_claim_type != NFS4_OPEN_CLAIM_DELEGATE_CUR)
> + if (!nfsd4_is_deleg_cur(open))
> return nfs_ok;
> if (status)
> return status;
> @@ -2882,7 +2888,7 @@ static int nfs4_set_delegation(struct nfs4_delegation *dp, int flag)
> goto out;
> } else {
> status = nfserr_bad_stateid;
> - if (open->op_claim_type == NFS4_OPEN_CLAIM_DELEGATE_CUR)
> + if (nfsd4_is_deleg_cur(open))
> goto out;
> status = nfserr_jukebox;
> fp = alloc_init_file(ino);
> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
> index 645a0a9..fdc09a5 100644
> --- a/fs/nfsd/nfs4xdr.c
> +++ b/fs/nfsd/nfs4xdr.c
> @@ -803,6 +803,19 @@ static __be32 nfsd4_decode_opaque(struct nfsd4_compoundargs *argp, struct xdr_ne
> if ((status = check_filename(open->op_fname.data, open->op_fname.len, nfserr_inval)))
> return status;
> break;
> + case NFS4_OPEN_CLAIM_FH:
> + case NFS4_OPEN_CLAIM_DELEG_PREV_FH:
> + if (argp->minorversion < 1)
> + goto xdr_error;
> + /* void */
> + break;
> + case NFS4_OPEN_CLAIM_DELEG_CUR_FH:
> + if (argp->minorversion < 1)
> + goto xdr_error;
> + status = nfsd4_decode_stateid(argp, &open->op_delegate_stateid);
> + if (status)
> + return status;
> + break;
> default:
> goto xdr_error;
> }
> diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
> index b875b03..32345c2 100644
> --- a/include/linux/nfs4.h
> +++ b/include/linux/nfs4.h
> @@ -410,7 +410,10 @@ enum open_claim_type4 {
> NFS4_OPEN_CLAIM_NULL = 0,
> NFS4_OPEN_CLAIM_PREVIOUS = 1,
> NFS4_OPEN_CLAIM_DELEGATE_CUR = 2,
> - NFS4_OPEN_CLAIM_DELEGATE_PREV = 3
> + NFS4_OPEN_CLAIM_DELEGATE_PREV = 3,
> + NFS4_OPEN_CLAIM_FH = 4, /* 4.1 */
> + NFS4_OPEN_CLAIM_DELEG_CUR_FH = 5, /* 4.1 */
> + NFS4_OPEN_CLAIM_DELEG_PREV_FH = 6, /* 4.1 */
> };
>
> enum opentype4 {
> --
> 1.7.6
>
next prev parent reply other threads:[~2011-10-20 12:23 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-20 2:10 [PATCH 0/7] Bakeathon server fixes Benny Halevy
2011-10-20 2:12 ` [PATCH 1/7] nfsd4: implement new 4.1 open reclaim types Benny Halevy
2011-10-20 12:23 ` J. Bruce Fields [this message]
2011-10-20 2:12 ` [PATCH 2/7] nfsd41: use SEQ4_STATUS_BACKCHANNEL_FAULT when cb_sequence is invalid Benny Halevy
2011-10-20 2:13 ` [PATCH 3/7] nfsd4: seq->status_flags may be used unitialized Benny Halevy
2011-10-20 2:13 ` [PATCH 4/7] nfsd4: allow NFS4_SHARE_SIGNAL_DELEG_WHEN_RESRC_AVAIL | NFS4_SHARE_PUSH_DELEG_WHEN_UNCONTENDED Benny Halevy
2011-10-20 2:13 ` [PATCH 5/7] nfsd4: implement NFS4_SHARE_WANT_NO_DELEG, NFS4_OPEN_DELEGATE_NONE_EXT Benny Halevy
2011-10-20 11:52 ` J. Bruce Fields
2011-10-20 12:36 ` Benny Halevy
2011-10-20 12:47 ` J. Bruce Fields
2011-10-20 19:16 ` Benny Halevy
2011-10-20 19:21 ` J. Bruce Fields
2011-10-20 2:13 ` [PATCH 6/7] nfsd4: typo logical vs bitwise negate for want_mask Benny Halevy
2011-10-20 11:53 ` J. Bruce Fields
2011-10-20 2:13 ` [PATCH 7/7] nfsd4: share_access_to_flags should consider only nfs4.x share_access flags Benny Halevy
2011-10-20 11:56 ` J. Bruce Fields
2011-10-20 18:59 ` Benny Halevy
2011-10-20 11:58 ` [PATCH 0/7] Bakeathon server fixes J. Bruce Fields
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=20111020122334.GM5444@fieldses.org \
--to=bfields@fieldses.org \
--cc=benny@tonian.com \
--cc=bfields@redhat.com \
--cc=bhalevy@tonian.com \
--cc=linux-nfs@vger.kernel.org \
--cc=mijinlong@cn.fujitsu.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).