[PATCH 1/2 dhowells/mount-api] staging: erofs: rename superblock flags (MS_xyz -> SB_xyz)

[PATCH 1/2 dhowells/mount-api] staging: erofs: rename superblock flags (MS_xyz -> SB_xyz)

[Gao Xiang]

This patch follows commit 1751e8a6cb93 ("Rename superblock
flags (MS_xyz -> SB_xyz)") and after commit ("vfs: Suppress
MS_* flag defs within the kernel unless explicitly enabled"),
there is no MS_RDONLY and MS_NOATIME at all.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
---

Once used MS_RDONLY, MS_NOATIME for the compatibility of older kernels,
which are removed in ("vfs: Suppress MS_* flag defs within the kernel
unless explicitly enabled").

 drivers/staging/erofs/super.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/erofs/super.c b/drivers/staging/erofs/super.c
index 1aec509..2df9768 100644
--- a/drivers/staging/erofs/super.c
+++ b/drivers/staging/erofs/super.c
@@ -340,7 +340,7 @@ static int erofs_read_super(struct super_block *sb,
 		goto err_sbread;
 
 	sb->s_magic = EROFS_SUPER_MAGIC;
-	sb->s_flags |= MS_RDONLY | MS_NOATIME;
+	sb->s_flags |= SB_RDONLY | SB_NOATIME;
 	sb->s_maxbytes = MAX_LFS_FILESIZE;
 	sb->s_time_gran = 1;
 
@@ -627,7 +627,7 @@ static int erofs_remount(struct super_block *sb, int *flags, char *data)
 {
 	BUG_ON(!sb_rdonly(sb));
 
-	*flags |= MS_RDONLY;
+	*flags |= SB_RDONLY;
 	return 0;
 }
 
-- 
1.9.1

[PATCH 2/2 dhowells/mount-api] staging: erofs: update .mount and .remount_sb

[Gao Xiang]

This patch updates .mount and .remount_sb after
commit ("vfs: Require specification of size of
mount data for internal mounts") in reference to
drivers/usb/gadget/function/f_fs.c.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
---
 drivers/staging/erofs/super.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/erofs/super.c b/drivers/staging/erofs/super.c
index 2df9768..98614f1 100644
--- a/drivers/staging/erofs/super.c
+++ b/drivers/staging/erofs/super.c
@@ -480,7 +480,7 @@ struct erofs_mount_private {
 
 /* support mount_bdev() with options */
 static int erofs_fill_super(struct super_block *sb,
-	void *_priv, int silent)
+	void *_priv, size_t data_size, int silent)
 {
 	struct erofs_mount_private *priv = _priv;
 
@@ -488,9 +488,9 @@ static int erofs_fill_super(struct super_block *sb,
 		priv->options, silent);
 }
 
-static struct dentry *erofs_mount(
-	struct file_system_type *fs_type, int flags,
-	const char *dev_name, void *data)
+static struct dentry *erofs_mount(struct file_system_type *fs_type,
+				  int flags, const char *dev_name,
+				  void *data, size_t data_size)
 {
 	struct erofs_mount_private priv = {
 		.dev_name = dev_name,
@@ -498,7 +498,7 @@ static struct dentry *erofs_mount(
 	};
 
 	return mount_bdev(fs_type, flags, dev_name,
-		&priv, erofs_fill_super);
+		&priv, sizeof(priv), erofs_fill_super);
 }
 
 static void erofs_kill_sb(struct super_block *sb)
@@ -623,7 +623,8 @@ static int erofs_show_options(struct seq_file *seq, struct dentry *root)
 	return 0;
 }
 
-static int erofs_remount(struct super_block *sb, int *flags, char *data)
+static int erofs_remount(struct super_block *sb, int *flags,
+			 char *data, size_t data_size)
 {
 	BUG_ON(!sb_rdonly(sb));
 
-- 
1.9.1

Re: [PATCH 2/2 dhowells/mount-api] staging: erofs: update .mount and .remount_sb

[Chao Yu]

On 2018/9/6 17:01, Gao Xiang wrote:
> This patch updates .mount and .remount_sb after
> commit ("vfs: Require specification of size of
> mount data for internal mounts") in reference to
> drivers/usb/gadget/function/f_fs.c.
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>

Reviewed-by: Chao Yu <yuchao0@huawei.com>

Thanks,

Re: [PATCH 1/2 dhowells/mount-api] staging: erofs: rename superblock flags (MS_xyz -> SB_xyz)

[David Howells]

Gao Xiang <gaoxiang25@huawei.com> wrote:

> This patch follows commit 1751e8a6cb93 ("Rename superblock
> flags (MS_xyz -> SB_xyz)") and after commit ("vfs: Suppress
> MS_* flag defs within the kernel unless explicitly enabled"),
> there is no MS_RDONLY and MS_NOATIME at all.
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Reviewed-by: Chao Yu <yuchao0@huawei.com>
> Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>

I recommend pushing this one to Linus now.  It's trivial enough.

Reviewed-by: David Howells <dhowells@redhat.com>

Re: [PATCH 1/2 dhowells/mount-api] staging: erofs: rename superblock flags (MS_xyz -> SB_xyz)

[Gao Xiang]

On 2018/9/6 18:08, David Howells wrote:
> Gao Xiang <gaoxiang25@huawei.com> wrote:
> 
>> This patch follows commit 1751e8a6cb93 ("Rename superblock
>> flags (MS_xyz -> SB_xyz)") and after commit ("vfs: Suppress
>> MS_* flag defs within the kernel unless explicitly enabled"),
>> there is no MS_RDONLY and MS_NOATIME at all.
>>
>> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> Reviewed-by: Chao Yu <yuchao0@huawei.com>
>> Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
> I recommend pushing this one to Linus now.  It's trivial enough.

Hi David,
I personally think that is fine, but I'd like to get Greg's idea and agreement, too...

> 
> Reviewed-by: David Howells <dhowells@redhat.com>

Hi Greg,

As David suggested above, could you please help merge this patch to Linus?
It's trivial enough (since the commit 1751e8a6cb93) and MS_xyz will be removed
in the new mount apis patchset...

Thanks in advance...

Thanks,
Gao Xiang

Re: [PATCH 1/2 dhowells/mount-api] staging: erofs: rename superblock flags (MS_xyz -> SB_xyz)

[Greg Kroah-Hartman]

On Thu, Sep 06, 2018 at 06:37:37PM +0800, Gao Xiang wrote:
> 
> 
> On 2018/9/6 18:08, David Howells wrote:
> > Gao Xiang <gaoxiang25@huawei.com> wrote:
> > 
> >> This patch follows commit 1751e8a6cb93 ("Rename superblock
> >> flags (MS_xyz -> SB_xyz)") and after commit ("vfs: Suppress
> >> MS_* flag defs within the kernel unless explicitly enabled"),
> >> there is no MS_RDONLY and MS_NOATIME at all.
> >>
> >> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> >> Reviewed-by: Chao Yu <yuchao0@huawei.com>
> >> Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
> > I recommend pushing this one to Linus now.  It's trivial enough.
> 
> Hi David,
> I personally think that is fine, but I'd like to get Greg's idea and agreement, too...
> 
> > 
> > Reviewed-by: David Howells <dhowells@redhat.com>
> 
> Hi Greg,
> 
> As David suggested above, could you please help merge this patch to Linus?
> It's trivial enough (since the commit 1751e8a6cb93) and MS_xyz will be removed
> in the new mount apis patchset...

Now applied to my local tree, thanks.

greg k-h

Re: [PATCH 1/2 dhowells/mount-api] staging: erofs: rename superblock flags (MS_xyz -> SB_xyz)

[Gao Xiang]

Hi Greg,

On 2018/9/10 16:13, Greg Kroah-Hartman wrote:
> On Thu, Sep 06, 2018 at 06:37:37PM +0800, Gao Xiang wrote:
>>
>>
>> On 2018/9/6 18:08, David Howells wrote:
>>> Gao Xiang <gaoxiang25@huawei.com> wrote:
>>>
>>>> This patch follows commit 1751e8a6cb93 ("Rename superblock
>>>> flags (MS_xyz -> SB_xyz)") and after commit ("vfs: Suppress
>>>> MS_* flag defs within the kernel unless explicitly enabled"),
>>>> there is no MS_RDONLY and MS_NOATIME at all.
>>>>
>>>> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
>>>> Reviewed-by: Chao Yu <yuchao0@huawei.com>
>>>> Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
>>> I recommend pushing this one to Linus now.  It's trivial enough.
>>
>> Hi David,
>> I personally think that is fine, but I'd like to get Greg's idea and agreement, too...
>>
>>>
>>> Reviewed-by: David Howells <dhowells@redhat.com>
>>
>> Hi Greg,
>>
>> As David suggested above, could you please help merge this patch to Linus?
>> It's trivial enough (since the commit 1751e8a6cb93) and MS_xyz will be removed
>> in the new mount apis patchset...
> 
> Now applied to my local tree, thanks.
> 

Thanks for applying. :)

Thanks,
Gao Xiang


> greg k-h
> 

Re: [PATCH 2/2 dhowells/mount-api] staging: erofs: update .mount and .remount_sb

[David Howells]

Gao Xiang <gaoxiang25@huawei.com> wrote:

> This patch updates .mount and .remount_sb after
> commit ("vfs: Require specification of size of
> mount data for internal mounts") in reference to
> drivers/usb/gadget/function/f_fs.c.
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>

I've folded this into my patch.

David