On Wed, 29 Jun 2022, Chuck Lever III wrote: > > > On Jun 13, 2022, at 7:18 PM, NeilBrown <neilb@xxxxxxx> wrote: > > diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c > > index c29baa03dfaf..a50db688c60d 100644 > > --- a/fs/nfsd/nfsfh.c > > +++ b/fs/nfsd/nfsfh.c > > @@ -616,7 +616,7 @@ fh_update(struct svc_fh *fhp) > > * @fhp: file handle to be updated > > * > > */ > > -void fh_fill_pre_attrs(struct svc_fh *fhp) > > +void fh_fill_pre_attrs(struct svc_fh *fhp, bool atomic) > > Hi Neil, just noticed this: > > CC [M] fs/nfsd/nfsfh.o > CHECK /home/cel/src/linux/linux/fs/nfsd/nfsfh.c > /home/cel/src/linux/linux/fs/nfsd/nfsfh.c:621: warning: Function parameter or member 'atomic' not described in 'fh_fill_pre_attrs' Thanks. I"ll address that, and also the other issues that you raised in your patch-by-patch review. Thanks for those. > > And... do you intend to repost this series with the supplemental > fixes applied? I've been a bit distracted this week, but my current plan is to reorganise the patches to put as many of the NFS and NFSD patches as possible before the VFS patches. There should then just be one each for NFS and NFSD after the VFS changes. I hope to post that series early next week. > > Should we come up with a plan to merge these during the next > window, or do you feel more work is needed? I think it would be reasonable to merge the preliminary NFS and NFSD patches in the next window. I'd really like to hear from Al before pushing the rest too hard. Probably after rc1 I'll post the remainder of the series and include Linus if we haven't heard from Al. I'd be perfectly happy if the main content of the series landed in the subsequent merge window. Thanks, NeilBrown
