| Message ID | 20221207084309.8499-4-richard@nod.at (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | NFS: NFSD: Allow crossing mounts when re-exporting | expand |
> On Dec 7, 2022, at 3:43 AM, Richard Weinberger <richard@nod.at> wrote: > > Now with NFSD being able to cross into auto mounts, > the check can be removed. > > Signed-off-by: Richard Weinberger <richard@nod.at> > --- > 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
On Wed, Dec 14, 2022 at 10:09 AM Chuck Lever III <chuck.lever@oracle.com> wrote: > > > > > On Dec 7, 2022, at 3:43 AM, Richard Weinberger <richard@nod.at> wrote: > > > > Now with NFSD being able to cross into auto mounts, > > the check can be removed. > > > > Signed-off-by: Richard Weinberger <richard@nod.at> > > --- > > 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 <Anna.Schumaker@Netapp.com> > > -- > Chuck Lever > > >
> On Dec 14, 2022, at 11:37 AM, Anna Schumaker <anna@kernel.org> wrote: > > On Wed, Dec 14, 2022 at 10:09 AM Chuck Lever III <chuck.lever@oracle.com> wrote: >> >> >> >>> On Dec 7, 2022, at 3:43 AM, Richard Weinberger <richard@nod.at> wrote: >>> >>> Now with NFSD being able to cross into auto mounts, >>> the check can be removed. >>> >>> Signed-off-by: Richard Weinberger <richard@nod.at> >>> --- >>> 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 <Anna.Schumaker@Netapp.com> Thanks! -- Chuck Lever
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;
Now with NFSD being able to cross into auto mounts, the check can be removed. Signed-off-by: Richard Weinberger <richard@nod.at> --- fs/nfs/export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)