| Message ID | 169288742767.62637.4868507858344398487.stgit@klimt.1015granger.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | NFSD: Fix a thinko introduced by recent trace point changes | expand |
On Thu, 2023-08-24 at 10:30 -0400, Chuck Lever wrote: > From: Chuck Lever <chuck.lever@oracle.com> > > The fixed commit erroneously removed a call to nfsd_end_grace(), > which makes calls to write_v4_end_grace() a no-op. > > Fixes: 39d432fc7630 ("NFSD: trace nfsctl operations") > Reported-by: kernel test robot <oliver.sang@intel.com> > Closes: https://lore.kernel.org/oe-lkp/202308241229.68396422-oliver.sang@intel.com > Signed-off-by: Chuck Lever <chuck.lever@oracle.com> > --- > fs/nfsd/nfsctl.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c > index 1b8b1aab9a15..4302ca0ff6ed 100644 > --- a/fs/nfsd/nfsctl.c > +++ b/fs/nfsd/nfsctl.c > @@ -1105,6 +1105,7 @@ static ssize_t write_v4_end_grace(struct file *file, char *buf, size_t size) > if (!nn->nfsd_serv) > return -EBUSY; > trace_nfsd_end_grace(netns(file)); > + nfsd4_end_grace(nn); > break; > default: > return -EINVAL; > > Reviewed-by: Jeff Layton <jlayton@kernel.org>
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 1b8b1aab9a15..4302ca0ff6ed 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -1105,6 +1105,7 @@ static ssize_t write_v4_end_grace(struct file *file, char *buf, size_t size) if (!nn->nfsd_serv) return -EBUSY; trace_nfsd_end_grace(netns(file)); + nfsd4_end_grace(nn); break; default: return -EINVAL;