[PATCH v1] CIFS: display noacl and locallease in the mount options

[PATCH v1] CIFS: display noacl and locallease in the mount options

[XiaoLi Feng]

From: "fengxiaoli0714@gmai.com" <fengxiaoli0714@gmail.com>

The mount option noacl and locallease aren't shown in /proc/mounts
even if they are mounted successfully. Now display them.

Signed-off-by: fengxiaoli0714@gmai.com <fengxiaoli0714@gmail.com>
---
 fs/cifs/cifsfs.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index f9b71c12cc9f..44dbace210d2 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -503,6 +503,8 @@ cifs_show_options(struct seq_file *s, struct dentry *root)
 		seq_puts(s, ",unix");
 	else
 		seq_puts(s, ",nounix");
+	if (tcon->local_lease)
+		seq_puts(s, ",locallease");
 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_DFS)
 		seq_puts(s, ",nodfs");
 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS)
@@ -535,6 +537,8 @@ cifs_show_options(struct seq_file *s, struct dentry *root)
 		seq_puts(s, ",dynperm");
 	if (root->d_sb->s_flags & SB_POSIXACL)
 		seq_puts(s, ",acl");
+	else
+		seq_puts(s, ",noacl");
 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS)
 		seq_puts(s, ",mfsymlinks");
 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_FSCACHE)
-- 
2.18.1

Re: [PATCH v1] CIFS: display noacl and locallease in the mount options

[Kenneth Dsouza]

We already have locallease patch in for next.
https://git.samba.org/?p=sfrench/cifs-2.6.git;a=commit;h=1d4fcc75b71f8a9f9807a000da53d9885546e2f3
Can you resend this patch only for noacl?

On Tue, Apr 9, 2019 at 6:47 PM XiaoLi Feng <xifeng@redhat.com> wrote:
>
> From: "fengxiaoli0714@gmai.com" <fengxiaoli0714@gmail.com>
>
> The mount option noacl and locallease aren't shown in /proc/mounts
> even if they are mounted successfully. Now display them.
>
> Signed-off-by: fengxiaoli0714@gmai.com <fengxiaoli0714@gmail.com>
> ---
>  fs/cifs/cifsfs.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
> index f9b71c12cc9f..44dbace210d2 100644
> --- a/fs/cifs/cifsfs.c
> +++ b/fs/cifs/cifsfs.c
> @@ -503,6 +503,8 @@ cifs_show_options(struct seq_file *s, struct dentry *root)
>                 seq_puts(s, ",unix");
>         else
>                 seq_puts(s, ",nounix");
> +       if (tcon->local_lease)
> +               seq_puts(s, ",locallease");
>         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_DFS)
>                 seq_puts(s, ",nodfs");
>         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS)
> @@ -535,6 +537,8 @@ cifs_show_options(struct seq_file *s, struct dentry *root)
>                 seq_puts(s, ",dynperm");
>         if (root->d_sb->s_flags & SB_POSIXACL)
>                 seq_puts(s, ",acl");
> +       else
> +               seq_puts(s, ",noacl");
>         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS)
>                 seq_puts(s, ",mfsymlinks");
>         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_FSCACHE)
> --
> 2.18.1
>

Re: [PATCH v1] CIFS: display noacl and locallease in the mount options

[Xiaoli Feng]

Hi Kenneth,

Now re-sended it. By the way, suddenly I have an idea. Such as for your this
patch, I suppose you see the bug 

  https://bugzilla.redhat.com/show_bug.cgi?id=1662406
  Bug 1662406 - [RHEL8 cifs]: the option locallease isn't shown in /proc/mounts

and then send this patch. I think it's better that add the bugzilla info in the
commit log. Just my opinion. But if you didn't see this bugzilla, ignore what
I said.

Thanks.

----- Original Message -----
> From: "Kenneth Dsouza" <kdsouza@redhat.com>
> To: "XiaoLi Feng" <xifeng@redhat.com>
> Cc: "CIFS" <linux-cifs@vger.kernel.org>, "fengxiaoli0714@gmai.com" <fengxiaoli0714@gmail.com>
> Sent: Tuesday, April 9, 2019 9:59:39 PM
> Subject: Re: [PATCH v1] CIFS: display noacl and locallease in the mount options
> 
> We already have locallease patch in for next.
> https://git.samba.org/?p=sfrench/cifs-2.6.git;a=commit;h=1d4fcc75b71f8a9f9807a000da53d9885546e2f3
> Can you resend this patch only for noacl?
> 
> On Tue, Apr 9, 2019 at 6:47 PM XiaoLi Feng <xifeng@redhat.com> wrote:
> >
> > From: "fengxiaoli0714@gmai.com" <fengxiaoli0714@gmail.com>
> >
> > The mount option noacl and locallease aren't shown in /proc/mounts
> > even if they are mounted successfully. Now display them.
> >
> > Signed-off-by: fengxiaoli0714@gmai.com <fengxiaoli0714@gmail.com>
> > ---
> >  fs/cifs/cifsfs.c | 4 ++++
> >  1 file changed, 4 insertions(+)
> >
> > diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
> > index f9b71c12cc9f..44dbace210d2 100644
> > --- a/fs/cifs/cifsfs.c
> > +++ b/fs/cifs/cifsfs.c
> > @@ -503,6 +503,8 @@ cifs_show_options(struct seq_file *s, struct dentry
> > *root)
> >                 seq_puts(s, ",unix");
> >         else
> >                 seq_puts(s, ",nounix");
> > +       if (tcon->local_lease)
> > +               seq_puts(s, ",locallease");
> >         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_DFS)
> >                 seq_puts(s, ",nodfs");
> >         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS)
> > @@ -535,6 +537,8 @@ cifs_show_options(struct seq_file *s, struct dentry
> > *root)
> >                 seq_puts(s, ",dynperm");
> >         if (root->d_sb->s_flags & SB_POSIXACL)
> >                 seq_puts(s, ",acl");
> > +       else
> > +               seq_puts(s, ",noacl");
> >         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS)
> >                 seq_puts(s, ",mfsymlinks");
> >         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_FSCACHE)
> > --
> > 2.18.1
> >
>