Please pull the following bug fixes for 3.15 from:
git://linux-nfs.org/~bfields/linux.git for-3.15
Three small nfsd bugfixes (including one locks.c fix for a bug triggered
only from nfsd).
Jeff's patches are for long-existing problems that became easier to
trigger since the addition of vfs delegation support.
--b.
----------------------------------------------------------------
J. Bruce Fields (1):
Revert "nfsd4: fix nfs4err_resource in 4.1 case"
Jeff Layton (2):
locks: allow __break_lease to sleep even when break_time is 0
nfsd: set timeparms.to_maxval in setup_callback_client
fs/locks.c | 7 +++----
fs/nfsd/nfs4callback.c | 4 +++-
fs/nfsd/nfs4xdr.c | 8 --------
3 files changed, 6 insertions(+), 13 deletions(-)
Hi Bruce,
On Thu, Apr 24, 2014 at 2:25 AM, J. Bruce Fields <[email protected]> wrote:
> Please pull the following bug fixes for 3.15 from:
>
> git://linux-nfs.org/~bfields/linux.git for-3.15
>
> Three small nfsd bugfixes (including one locks.c fix for a bug triggered
> only from nfsd).
>
> Jeff's patches are for long-existing problems that became easier to
> trigger since the addition of vfs delegation support.
>
> --b.
>
> ----------------------------------------------------------------
> J. Bruce Fields (1):
> Revert "nfsd4: fix nfs4err_resource in 4.1 case"
>
Wait. Why? NFS4ERR_RESOURCE breaks the Linux client.
--
Trond Myklebust
Linux NFS client maintainer, PrimaryData
[email protected]
On Thu, Apr 24, 2014 at 06:51:03AM -0400, Trond Myklebust wrote:
> Hi Bruce,
>
> On Thu, Apr 24, 2014 at 2:25 AM, J. Bruce Fields <[email protected]> wrote:
> > Please pull the following bug fixes for 3.15 from:
> >
> > git://linux-nfs.org/~bfields/linux.git for-3.15
> >
> > Three small nfsd bugfixes (including one locks.c fix for a bug triggered
> > only from nfsd).
> >
> > Jeff's patches are for long-existing problems that became easier to
> > trigger since the addition of vfs delegation support.
> >
> > --b.
> >
> > ----------------------------------------------------------------
> > J. Bruce Fields (1):
> > Revert "nfsd4: fix nfs4err_resource in 4.1 case"
> >
>
> Wait. Why?
Have you changed your mind since our previous discussion, or just
forgotten it? (Or did I screw up and revert the wrong commit?) See
http://mid.gmane.org/<[email protected]>
> NFS4ERR_RESOURCE breaks the Linux client.
This returns us to pre-3.15 behavior so shouldn't introduce any new
breakage.
Fundamentally the problem is that we're returning an error in cases that
shouldn't succeed, and rather than replacing one incorrect error by
another it seemed better to wait for a proper fix.
--b.
On Thu, Apr 24, 2014 at 11:31:16AM -0400, J. Bruce Fields wrote:
> On Thu, Apr 24, 2014 at 06:51:03AM -0400, Trond Myklebust wrote:
> > Hi Bruce,
> >
> > On Thu, Apr 24, 2014 at 2:25 AM, J. Bruce Fields <[email protected]> wrote:
> > > Please pull the following bug fixes for 3.15 from:
> > >
> > > git://linux-nfs.org/~bfields/linux.git for-3.15
> > >
> > > Three small nfsd bugfixes (including one locks.c fix for a bug triggered
> > > only from nfsd).
> > >
> > > Jeff's patches are for long-existing problems that became easier to
> > > trigger since the addition of vfs delegation support.
> > >
> > > --b.
> > >
> > > ----------------------------------------------------------------
> > > J. Bruce Fields (1):
> > > Revert "nfsd4: fix nfs4err_resource in 4.1 case"
> > >
> >
> > Wait. Why?
>
> Have you changed your mind since our previous discussion, or just
> forgotten it? (Or did I screw up and revert the wrong commit?) See
>
> http://mid.gmane.org/<[email protected]>
>
> > NFS4ERR_RESOURCE breaks the Linux client.
>
> This returns us to pre-3.15 behavior so shouldn't introduce any new
> breakage.
>
> Fundamentally the problem is that we're returning an error in cases that
> shouldn't succeed, and rather than replacing one incorrect error by
s/shouldn't/should/, apologies!--b.
> another it seemed better to wait for a proper fix.
>
> --b.
On Thu, Apr 24, 2014 at 12:34 PM, J. Bruce Fields <[email protected]> wrote:
> On Thu, Apr 24, 2014 at 11:31:16AM -0400, J. Bruce Fields wrote:
>> On Thu, Apr 24, 2014 at 06:51:03AM -0400, Trond Myklebust wrote:
>> > Hi Bruce,
>> >
>> > On Thu, Apr 24, 2014 at 2:25 AM, J. Bruce Fields <[email protected]> wrote:
>> > > Please pull the following bug fixes for 3.15 from:
>> > >
>> > > git://linux-nfs.org/~bfields/linux.git for-3.15
>> > >
>> > > Three small nfsd bugfixes (including one locks.c fix for a bug triggered
>> > > only from nfsd).
>> > >
>> > > Jeff's patches are for long-existing problems that became easier to
>> > > trigger since the addition of vfs delegation support.
>> > >
>> > > --b.
>> > >
>> > > ----------------------------------------------------------------
>> > > J. Bruce Fields (1):
>> > > Revert "nfsd4: fix nfs4err_resource in 4.1 case"
>> > >
>> >
>> > Wait. Why?
>>
>> Have you changed your mind since our previous discussion, or just
>> forgotten it? (Or did I screw up and revert the wrong commit?) See
>>
>> http://mid.gmane.org/<[email protected]>
>>
>> > NFS4ERR_RESOURCE breaks the Linux client.
>>
>> This returns us to pre-3.15 behavior so shouldn't introduce any new
>> breakage.
>>
>> Fundamentally the problem is that we're returning an error in cases that
>> shouldn't succeed, and rather than replacing one incorrect error by
>
> s/shouldn't/should/, apologies!--b.
>
>> another it seemed better to wait for a proper fix.
>>
>> --b.
I really shouldn't try to read my email before 8am (or at least not
before my third espresso). I was confusing this with the
NFS4ERR_STALE_STATEID problem that was merged as part of the same
pull.
Reverting the NFS4ERR_RESOURCE patch is fine.
Apologies,
Trond
--
Trond Myklebust
Linux NFS client maintainer, PrimaryData
[email protected]
On Thu, Apr 24, 2014 at 12:46:36PM -0400, Trond Myklebust wrote:
> On Thu, Apr 24, 2014 at 12:34 PM, J. Bruce Fields <[email protected]> wrote:
> > On Thu, Apr 24, 2014 at 11:31:16AM -0400, J. Bruce Fields wrote:
> >> On Thu, Apr 24, 2014 at 06:51:03AM -0400, Trond Myklebust wrote:
> >> > Hi Bruce,
> >> >
> >> > On Thu, Apr 24, 2014 at 2:25 AM, J. Bruce Fields <[email protected]> wrote:
> >> > > Please pull the following bug fixes for 3.15 from:
> >> > >
> >> > > git://linux-nfs.org/~bfields/linux.git for-3.15
> >> > >
> >> > > Three small nfsd bugfixes (including one locks.c fix for a bug triggered
> >> > > only from nfsd).
> >> > >
> >> > > Jeff's patches are for long-existing problems that became easier to
> >> > > trigger since the addition of vfs delegation support.
> >> > >
> >> > > --b.
> >> > >
> >> > > ----------------------------------------------------------------
> >> > > J. Bruce Fields (1):
> >> > > Revert "nfsd4: fix nfs4err_resource in 4.1 case"
> >> > >
> >> >
> >> > Wait. Why?
> >>
> >> Have you changed your mind since our previous discussion, or just
> >> forgotten it? (Or did I screw up and revert the wrong commit?) See
> >>
> >> http://mid.gmane.org/<[email protected]>
> >>
> >> > NFS4ERR_RESOURCE breaks the Linux client.
> >>
> >> This returns us to pre-3.15 behavior so shouldn't introduce any new
> >> breakage.
> >>
> >> Fundamentally the problem is that we're returning an error in cases that
> >> shouldn't succeed, and rather than replacing one incorrect error by
> >
> > s/shouldn't/should/, apologies!--b.
> >
> >> another it seemed better to wait for a proper fix.
> >>
> >> --b.
>
> I really shouldn't try to read my email before 8am (or at least not
> before my third espresso). I was confusing this with the
> NFS4ERR_STALE_STATEID problem that was merged as part of the same
> pull.
> Reverting the NFS4ERR_RESOURCE patch is fine.
Great, thanks.--b.