| Message ID | 20201201041427.756749-1-trondmy@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] nfsd: Avoid /* Fallthrough */ | expand |
Hi - > On Nov 30, 2020, at 11:14 PM, trondmy@kernel.org wrote: > > From: Trond Myklebust <trond.myklebust@hammerspace.com> > > The '/* Fallthrough */' comment is already deprecated. Avoid it. > > Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> I've squashed this into "nfsd: add a new EXPORT_OP_NOWCC flag to struct export_operations", in addition to addressing Jeff's comment about line in the patch description that states support for re-exporting NFS filesystems may never be supported. These changes will appear next time I push into the cel-next branch. > --- > fs/nfsd/nfsfh.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c > index 46c86f7bc429..e80a7525561d 100644 > --- a/fs/nfsd/nfsfh.c > +++ b/fs/nfsd/nfsfh.c > @@ -302,9 +302,9 @@ static __be32 nfsd_set_fh_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp) > > switch (rqstp->rq_vers) { > case 3: > - if (!(dentry->d_sb->s_export_op->flags & EXPORT_OP_NOWCC)) > - break; > - /* Fallthrough */ > + if (dentry->d_sb->s_export_op->flags & EXPORT_OP_NOWCC) > + fhp->fh_no_wcc = true; > + break; > case 2: > fhp->fh_no_wcc = true; > } > -- > 2.28.0 > -- Chuck Lever
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index 46c86f7bc429..e80a7525561d 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c @@ -302,9 +302,9 @@ static __be32 nfsd_set_fh_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp) switch (rqstp->rq_vers) { case 3: - if (!(dentry->d_sb->s_export_op->flags & EXPORT_OP_NOWCC)) - break; - /* Fallthrough */ + if (dentry->d_sb->s_export_op->flags & EXPORT_OP_NOWCC) + fhp->fh_no_wcc = true; + break; case 2: fhp->fh_no_wcc = true; }