Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
From:   "NeilBrown" <neilb@suse.de>
To:     "Anna Schumaker" <anna@kernel.org>
Cc:     "Trond Myklebust" <trondmy@kernel.org>,
        "Jeff Layton" <jlayton@kernel.org>,
        "Linux NFS Mailing List" <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH v3] NFSv3: handle out-of-order write replies.
In-reply-to: <CAFX2Jfnq6wcex_iwNP9gvpHLWbgSSkBDsy4cOLLHd3z5xiwq4w@mail.gmail.com>
References: <167633352764.1896.5445901294734308583@noble.neil.brown.name>,
 <167643799060.10099.2241433267195533803@noble.neil.brown.name>,
 <CAFX2Jfnq6wcex_iwNP9gvpHLWbgSSkBDsy4cOLLHd3z5xiwq4w@mail.gmail.com>
Date:   Thu, 16 Feb 2023 07:30:13 +1100
Message-id: <167649301340.15170.803705850078251758@noble.neil.brown.name>
Precedence: bulk

On Thu, 16 Feb 2023, Anna Schumaker wrote:
> Hi Neil,
> 
> On Wed, Feb 15, 2023 at 12:13 AM NeilBrown <neilb@suse.de> 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