2022-12-07 08:45:19

by Richard Weinberger

Subject: [PATCH 3/3] NFS: nfs_encode_fh: Remove S_AUTOMOUNT check

Now with NFSD being able to cross into auto mounts,
the check can be removed.

Signed-off-by: Richard Weinberger <[email protected]>
---
fs/nfs/export.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/nfs/export.c b/fs/nfs/export.c
index 01596f2d0a1e..0a5ee1754d50 100644
--- a/fs/nfs/export.c
+++ b/fs/nfs/export.c
@@ -42,7 +42,7 @@ nfs_encode_fh(struct inode *inode, __u32 *p, int *max_len, struct inode *parent)
dprintk("%s: max fh len %d inode %p parent %p",
__func__, *max_len, inode, parent);

- if (*max_len < len || IS_AUTOMOUNT(inode)) {
+ if (*max_len < len) {
dprintk("%s: fh len %d too small, required %d\n",
__func__, *max_len, len);
*max_len = len;
--
2.26.2

2022-12-14 15:18:32

by Chuck Lever III

Subject: Re: [PATCH 3/3] NFS: nfs_encode_fh: Remove S_AUTOMOUNT check

> On Dec 7, 2022, at 3:43 AM, Richard Weinberger <[email protected]> wrote:
>
> Now with NFSD being able to cross into auto mounts,
> the check can be removed.
>
> Signed-off-by: Richard Weinberger <[email protected]>
> ---
> fs/nfs/export.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/nfs/export.c b/fs/nfs/export.c
> index 01596f2d0a1e..0a5ee1754d50 100644
> --- a/fs/nfs/export.c
> +++ b/fs/nfs/export.c
> @@ -42,7 +42,7 @@ nfs_encode_fh(struct inode *inode, __u32 *p, int *max_len, struct inode *parent)
> dprintk("%s: max fh len %d inode %p parent %p",
> __func__, *max_len, inode, parent);
>
> - if (*max_len < len || IS_AUTOMOUNT(inode)) {
> + if (*max_len < len) {
> dprintk("%s: fh len %d too small, required %d\n",
> __func__, *max_len, len);
> *max_len = len;
> --
> 2.26.2
>

I plan to take this through the nfsd tree, thus this one needs
an Ack from the NFS client maintainers.

--
Chuck Lever

2022-12-14 16:54:16

by Anna Schumaker

Subject: Re: [PATCH 3/3] NFS: nfs_encode_fh: Remove S_AUTOMOUNT check

On Wed, Dec 14, 2022 at 10:09 AM Chuck Lever III <[email protected]> wrote:
>
>
>
> > On Dec 7, 2022, at 3:43 AM, Richard Weinberger <[email protected]> wrote:
> >
> > Now with NFSD being able to cross into auto mounts,
> > the check can be removed.
> >
> > Signed-off-by: Richard Weinberger <[email protected]>
> > ---
> > fs/nfs/export.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/fs/nfs/export.c b/fs/nfs/export.c
> > index 01596f2d0a1e..0a5ee1754d50 100644
> > --- a/fs/nfs/export.c
> > +++ b/fs/nfs/export.c
> > @@ -42,7 +42,7 @@ nfs_encode_fh(struct inode *inode, __u32 *p, int *max_len, struct inode *parent)
> > dprintk("%s: max fh len %d inode %p parent %p",
> > __func__, *max_len, inode, parent);
> >
> > - if (*max_len < len || IS_AUTOMOUNT(inode)) {
> > + if (*max_len < len) {
> > dprintk("%s: fh len %d too small, required %d\n",
> > __func__, *max_len, len);
> > *max_len = len;
> > --
> > 2.26.2
> >
>
> I plan to take this through the nfsd tree, thus this one needs
> an Ack from the NFS client maintainers.

Acked-by: Anna Schumaker <[email protected]>

>
> --
> Chuck Lever
>
>
>

2022-12-14 16:57:02

by Chuck Lever III

Subject: Re: [PATCH 3/3] NFS: nfs_encode_fh: Remove S_AUTOMOUNT check

> On Dec 14, 2022, at 11:37 AM, Anna Schumaker <[email protected]> wrote:
>
> On Wed, Dec 14, 2022 at 10:09 AM Chuck Lever III <[email protected]> wrote:
>>
>>
>>
>>> On Dec 7, 2022, at 3:43 AM, Richard Weinberger <[email protected]> wrote:
>>>
>>> Now with NFSD being able to cross into auto mounts,
>>> the check can be removed.
>>>
>>> Signed-off-by: Richard Weinberger <[email protected]>
>>> ---
>>> fs/nfs/export.c | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/fs/nfs/export.c b/fs/nfs/export.c
>>> index 01596f2d0a1e..0a5ee1754d50 100644
>>> --- a/fs/nfs/export.c
>>> +++ b/fs/nfs/export.c
>>> @@ -42,7 +42,7 @@ nfs_encode_fh(struct inode *inode, __u32 *p, int *max_len, struct inode *parent)
>>> dprintk("%s: max fh len %d inode %p parent %p",
>>> __func__, *max_len, inode, parent);
>>>
>>> - if (*max_len < len || IS_AUTOMOUNT(inode)) {
>>> + if (*max_len < len) {
>>> dprintk("%s: fh len %d too small, required %d\n",
>>> __func__, *max_len, len);
>>> *max_len = len;
>>> --
>>> 2.26.2
>>>
>>
>> I plan to take this through the nfsd tree, thus this one needs
>> an Ack from the NFS client maintainers.
>
> Acked-by: Anna Schumaker <[email protected]>

Thanks!

--
Chuck Lever