On Thu, 16 Feb 2023, Anna Schumaker wrote: > Hi Neil, > > On Wed, Feb 15, 2023 at 12:13 AM NeilBrown <neilb@xxxxxxx> wrote: > > > > +static void nfs_ooo_merge(struct nfs_inode *nfsi, > > + u64 start, u64 end) > > +{ > > + int i, cnt; > > + > > + if (nfsi->cache_validity & NFS_INO_DATA_INVAL_DEFER) > > + /* No point merging anything */ > > + return; > > + if (!S_ISREG(nfsi->vfs_inode.mode)) > > Um, should this be "vfs_inode.i_mode"? I'm also curious how you've > tested this, since the code won't compile without this change? I had removed this whole 'if' because I realised it wasn't really needed. The problem was that I hadn't refreshed that patch after final testing :-( I'll resend. Thanks, NeilBrown