linux-next: build warning after merge of the vfs tree

linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1612 bytes --]

Hi all,

After merging the vfs tree, today's linux-next build (x86_64 allmodconfig)
produced this warning:

In file included from fs/erofs/xattr.h:10,
                 from fs/erofs/namei.c:7:
fs/erofs/namei.c: In function 'erofs_lookup':
fs/erofs/internal.h:23:21: warning: format '%s' expects argument of type 'char *', but argument 4 has type 'struct dentry *' [-Wformat=]
   23 | #define pr_fmt(fmt) "erofs: " fmt
      |                     ^~~~~~~~~
include/linux/dynamic_debug.h:129:15: note: in expansion of macro 'pr_fmt'
  129 |   func(&id, ##__VA_ARGS__);  \
      |               ^~~~~~~~~~~
include/linux/dynamic_debug.h:147:2: note: in expansion of macro '__dynamic_func_call'
  147 |  __dynamic_func_call(__UNIQUE_ID(ddebug), fmt, func, ##__VA_ARGS__)
      |  ^~~~~~~~~~~~~~~~~~~
include/linux/dynamic_debug.h:157:2: note: in expansion of macro '_dynamic_func_call'
  157 |  _dynamic_func_call(fmt, __dynamic_pr_debug,  \
      |  ^~~~~~~~~~~~~~~~~~
include/linux/printk.h:424:2: note: in expansion of macro 'dynamic_pr_debug'
  424 |  dynamic_pr_debug(fmt, ##__VA_ARGS__)
      |  ^~~~~~~~~~~~~~~~
fs/erofs/internal.h:34:33: note: in expansion of macro 'pr_debug'
   34 | #define erofs_dbg(x, ...)       pr_debug(x "\n", ##__VA_ARGS__)
      |                                 ^~~~~~~~
fs/erofs/namei.c:237:3: note: in expansion of macro 'erofs_dbg'
  237 |   erofs_dbg("%pd, %s (nid %llu) found, d_type %u", __func__,
      |   ^~~~~~~~~

Introduced by commit

  879d4376533c ("erofs: use %pd instead of messing with ->d_name")

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build warning after merge of the vfs tree

[Gao Xiang]

Hi Al,

On Thu, Jan 07, 2021 at 10:15:44AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the vfs tree, today's linux-next build (x86_64 allmodconfig)
> produced this warning:
> 
> In file included from fs/erofs/xattr.h:10,
>                  from fs/erofs/namei.c:7:
> fs/erofs/namei.c: In function 'erofs_lookup':
> fs/erofs/internal.h:23:21: warning: format '%s' expects argument of type 'char *', but argument 4 has type 'struct dentry *' [-Wformat=]
>    23 | #define pr_fmt(fmt) "erofs: " fmt
>       |                     ^~~~~~~~~
> include/linux/dynamic_debug.h:129:15: note: in expansion of macro 'pr_fmt'
>   129 |   func(&id, ##__VA_ARGS__);  \
>       |               ^~~~~~~~~~~
> include/linux/dynamic_debug.h:147:2: note: in expansion of macro '__dynamic_func_call'
>   147 |  __dynamic_func_call(__UNIQUE_ID(ddebug), fmt, func, ##__VA_ARGS__)
>       |  ^~~~~~~~~~~~~~~~~~~
> include/linux/dynamic_debug.h:157:2: note: in expansion of macro '_dynamic_func_call'
>   157 |  _dynamic_func_call(fmt, __dynamic_pr_debug,  \
>       |  ^~~~~~~~~~~~~~~~~~
> include/linux/printk.h:424:2: note: in expansion of macro 'dynamic_pr_debug'
>   424 |  dynamic_pr_debug(fmt, ##__VA_ARGS__)
>       |  ^~~~~~~~~~~~~~~~
> fs/erofs/internal.h:34:33: note: in expansion of macro 'pr_debug'
>    34 | #define erofs_dbg(x, ...)       pr_debug(x "\n", ##__VA_ARGS__)
>       |                                 ^~~~~~~~
> fs/erofs/namei.c:237:3: note: in expansion of macro 'erofs_dbg'
>   237 |   erofs_dbg("%pd, %s (nid %llu) found, d_type %u", __func__,
>       |   ^~~~~~~~~

Thanks for modifying this. Use %pd is more reasonable than using d_name...
It might be fixed as "%s, %pd (nid %llu) ...", thanks for this!

Thanks,
Gao Xiang

> 
> Introduced by commit
> 
>   879d4376533c ("erofs: use %pd instead of messing with ->d_name")
> 
> -- 
> Cheers,
> Stephen Rothwell

Re: linux-next: build warning after merge of the vfs tree

[Al Viro]

On Thu, Jan 07, 2021 at 10:15:44AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the vfs tree, today's linux-next build (x86_64 allmodconfig)
> produced this warning:
> 
> In file included from fs/erofs/xattr.h:10,
>                  from fs/erofs/namei.c:7:
> fs/erofs/namei.c: In function 'erofs_lookup':
> fs/erofs/internal.h:23:21: warning: format '%s' expects argument of type 'char *', but argument 4 has type 'struct dentry *' [-Wformat=]
>    23 | #define pr_fmt(fmt) "erofs: " fmt
>       |                     ^~~~~~~~~
> include/linux/dynamic_debug.h:129:15: note: in expansion of macro 'pr_fmt'
>   129 |   func(&id, ##__VA_ARGS__);  \
>       |               ^~~~~~~~~~~
> include/linux/dynamic_debug.h:147:2: note: in expansion of macro '__dynamic_func_call'
>   147 |  __dynamic_func_call(__UNIQUE_ID(ddebug), fmt, func, ##__VA_ARGS__)
>       |  ^~~~~~~~~~~~~~~~~~~
> include/linux/dynamic_debug.h:157:2: note: in expansion of macro '_dynamic_func_call'
>   157 |  _dynamic_func_call(fmt, __dynamic_pr_debug,  \
>       |  ^~~~~~~~~~~~~~~~~~
> include/linux/printk.h:424:2: note: in expansion of macro 'dynamic_pr_debug'
>   424 |  dynamic_pr_debug(fmt, ##__VA_ARGS__)
>       |  ^~~~~~~~~~~~~~~~
> fs/erofs/internal.h:34:33: note: in expansion of macro 'pr_debug'
>    34 | #define erofs_dbg(x, ...)       pr_debug(x "\n", ##__VA_ARGS__)
>       |                                 ^~~~~~~~
> fs/erofs/namei.c:237:3: note: in expansion of macro 'erofs_dbg'
>   237 |   erofs_dbg("%pd, %s (nid %llu) found, d_type %u", __func__,
>       |   ^~~~~~~~~
> 
> Introduced by commit
> 
>   879d4376533c ("erofs: use %pd instead of messing with ->d_name")

Gyah...  "%s, %pd", not "%pd, %s".  Sorry, fixed and pushed.

Re: linux-next: build warning after merge of the vfs tree

[Al Viro]

On Mon, Apr 12, 2021 at 03:07:56PM +0200, Miklos Szeredi wrote:
> Hi Al,
> 
> Fixed fileattr branch pushed to:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git fileattr_v6

Merged and pushed out...

Re: linux-next: build warning after merge of the vfs tree

[Miklos Szeredi]

Hi Al,

Fixed fileattr branch pushed to:

  git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git fileattr_v6

Thanks,
Miklos

On Mon, Apr 12, 2021 at 1:47 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the vfs tree, today's linux-next build (htmldocs) produced
> this warning:
>
> Documentation/filesystems/locking.rst:113: WARNING: Malformed table.
> Text in column margin in table line 24.
>
> ============    =============================================
> ops             i_rwsem(inode)
> ============    =============================================
> lookup:         shared
> create:         exclusive
> link:           exclusive (both)
> mknod:          exclusive
> symlink:        exclusive
> mkdir:          exclusive
> unlink:         exclusive (both)
> rmdir:          exclusive (both)(see below)
> rename:         exclusive (all) (see below)
> readlink:       no
> get_link:       no
> setattr:        exclusive
> permission:     no (may not block if called in rcu-walk mode)
> get_acl:        no
> getattr:        no
> listxattr:      no
> fiemap:         no
> update_time:    no
> atomic_open:    shared (exclusive if O_CREAT is set in open flags)
> tmpfile:        no
> fileattr_get:   no or exclusive
> fileattr_set:   exclusive
> ============    =============================================
>
> Introduced by commit
>
>   10a489bbff3e ("vfs: add fileattr ops")
>
> --
> Cheers,
> Stephen Rothwell

linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1206 bytes --]

Hi all,

After merging the vfs tree, today's linux-next build (htmldocs) produced
this warning:

Documentation/filesystems/locking.rst:113: WARNING: Malformed table.
Text in column margin in table line 24.

============    =============================================
ops             i_rwsem(inode)
============    =============================================
lookup:         shared
create:         exclusive
link:           exclusive (both)
mknod:          exclusive
symlink:        exclusive
mkdir:          exclusive
unlink:         exclusive (both)
rmdir:          exclusive (both)(see below)
rename:         exclusive (all) (see below)
readlink:       no
get_link:       no
setattr:        exclusive
permission:     no (may not block if called in rcu-walk mode)
get_acl:        no
getattr:        no
listxattr:      no
fiemap:         no
update_time:    no
atomic_open:    shared (exclusive if O_CREAT is set in open flags)
tmpfile:        no
fileattr_get:   no or exclusive
fileattr_set:   exclusive
============    =============================================

Introduced by commit

  10a489bbff3e ("vfs: add fileattr ops")

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build warning after merge of the vfs tree

[Al Viro]

On Thu, Sep 24, 2020 at 11:40:50AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the vfs tree, today's linux-next build (x86_64 allmodconfig)
> produced this warning:
> 
> lib/strnlen_user.o: warning: objtool: strnlen_user()+0xf3: call to do_strnlen_user() with UACCESS enabled
> lib/strncpy_from_user.o: warning: objtool: strncpy_from_user()+0x188: call to do_strncpy_from_user() with UACCESS enabled

s/inline/__always_inline/ in those two...

Will be there tonight; they should've been inlined anyway on any sane config...

linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 485 bytes --]

Hi all,

After merging the vfs tree, today's linux-next build (x86_64 allmodconfig)
produced this warning:

lib/strnlen_user.o: warning: objtool: strnlen_user()+0xf3: call to do_strnlen_user() with UACCESS enabled
lib/strncpy_from_user.o: warning: objtool: strncpy_from_user()+0x188: call to do_strncpy_from_user() with UACCESS enabled

Introduced by commit

  e33ea6e5ba6a ("x86/uaccess: Use pointer masking to limit uaccess speculation")

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 991 bytes --]

Hi all,

After merging the vfs tree, today's linux-next build (powerpc
ppc64_defconfig) produced this warning:

In file included from include/linux/compat.h:15,
                 from arch/powerpc/kernel/asm-offsets.c:14:
include/linux/socket.h:419:38: warning: 'struct file' declared inside parameter list will not be visible outside of this definition or declaration
  419 | extern int __sys_accept4_file(struct file *file, unsigned file_flags,
      |                                      ^~~~
include/linux/socket.h:427:38: warning: 'struct file' declared inside parameter list will not be visible outside of this definition or declaration
  427 | extern int __sys_connect_file(struct file *file, struct sockaddr_storage *addr,
      |                                      ^~~~

And many more :-(

Introduced by commit

  f0187db056dc ("iov_iter: Move unnecessary inclusion of crypto/hash.h")

Tidying up include files is tricky :-(

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build warning after merge of the vfs tree

['Greg Kroah-Hartman']

On Tue, Mar 10, 2020 at 08:36:04AM +0900, Namjae Jeon wrote:
> > On Tuesday 10 March 2020 09:59:18 Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > After merging the vfs tree, today's linux-next build (x86_64
> > > allmodconfig) produced this warning:
> > >
> > > warning: same module names found:
> > >   fs/exfat/exfat.ko
> > >   drivers/staging/exfat/exfat.ko
> > >
> > > Introduced by commit
> > >
> > >   b9d1e2e6265f ("exfat: add Kconfig and Makefile")
> > >
> > > and not fixed by commit
> > >
> > >   1a3c0509ce83 ("staging: exfat: make staging/exfat and fs/exfat
> > > mutually exclusive")
> > 
> > Hello Stephen!
> > 
> > exfat.ko from fs/exfat subdirectory is a rewrite/cleanup of staging exfat
> > driver. It means that fs/exfat replaces staging/exfat and so after
> > fs/exfat is merged, the old staging/exfat code is not needed anymore.
> > 
> > Therefore I think that instead of hacking Kconfig/Makefile files to define
> > mutually exclusivity, it is better to remove staging/exfat code.
> > 
> > Removal of old staging code should be easy and should fix this problem.
> Agree.
> Greg, You told me to let me know when fs/exfat gets accepted. Now it's time
> to drop staging/exfat.

Wonderful!  I'll go drop it right now, thanks for letting me know!

greg k-h

RE: linux-next: build warning after merge of the vfs tree

[Namjae Jeon]

> On Tuesday 10 March 2020 09:59:18 Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the vfs tree, today's linux-next build (x86_64
> > allmodconfig) produced this warning:
> >
> > warning: same module names found:
> >   fs/exfat/exfat.ko
> >   drivers/staging/exfat/exfat.ko
> >
> > Introduced by commit
> >
> >   b9d1e2e6265f ("exfat: add Kconfig and Makefile")
> >
> > and not fixed by commit
> >
> >   1a3c0509ce83 ("staging: exfat: make staging/exfat and fs/exfat
> > mutually exclusive")
> 
> Hello Stephen!
> 
> exfat.ko from fs/exfat subdirectory is a rewrite/cleanup of staging exfat
> driver. It means that fs/exfat replaces staging/exfat and so after
> fs/exfat is merged, the old staging/exfat code is not needed anymore.
> 
> Therefore I think that instead of hacking Kconfig/Makefile files to define
> mutually exclusivity, it is better to remove staging/exfat code.
> 
> Removal of old staging code should be easy and should fix this problem.
Agree.
Greg, You told me to let me know when fs/exfat gets accepted. Now it's time
to drop staging/exfat.

Thanks!
> 
> Any objections? Or other ideas?

Re: linux-next: build warning after merge of the vfs tree

[Pali Rohár]

On Tuesday 10 March 2020 09:59:18 Stephen Rothwell wrote:
> Hi all,
> 
> After merging the vfs tree, today's linux-next build (x86_64 allmodconfig)
> produced this warning:
> 
> warning: same module names found:
>   fs/exfat/exfat.ko
>   drivers/staging/exfat/exfat.ko
> 
> Introduced by commit
> 
>   b9d1e2e6265f ("exfat: add Kconfig and Makefile")
> 
> and not fixed by commit
> 
>   1a3c0509ce83 ("staging: exfat: make staging/exfat and fs/exfat mutually exclusive")

Hello Stephen!

exfat.ko from fs/exfat subdirectory is a rewrite/cleanup of staging
exfat driver. It means that fs/exfat replaces staging/exfat and so after
fs/exfat is merged, the old staging/exfat code is not needed anymore.

Therefore I think that instead of hacking Kconfig/Makefile files to
define mutually exclusivity, it is better to remove staging/exfat code.

Removal of old staging code should be easy and should fix this problem.

Any objections? Or other ideas?

linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 841 bytes --]

Hi all,

After merging the vfs tree, today's linux-next build (x86_64 allmodconfig)
produced this warning:

warning: same module names found:
  fs/exfat/exfat.ko
  drivers/staging/exfat/exfat.ko

Introduced by commit

  b9d1e2e6265f ("exfat: add Kconfig and Makefile")

and not fixed by commit

  1a3c0509ce83 ("staging: exfat: make staging/exfat and fs/exfat mutually exclusive")

$ grep EXFAT .config
CONFIG_STAGING_EXFAT_FS=m
CONFIG_STAGING_EXFAT_DISCARD=y
CONFIG_STAGING_EXFAT_DELAYED_SYNC=y
CONFIG_STAGING_EXFAT_KERNEL_DEBUG=y
CONFIG_STAGING_EXFAT_DEBUG_MSG=y
CONFIG_STAGING_EXFAT_DEFAULT_CODEPAGE=437
CONFIG_STAGING_EXFAT_DEFAULT_IOCHARSET="utf8"
# DOS/FAT/EXFAT/NT Filesystems
CONFIG_EXFAT_FS=m
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
# end of DOS/FAT/EXFAT/NT Filesystems

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1706 bytes --]

Hi all,

On Mon, 18 Mar 2019 11:00:50 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon, 4 Feb 2019 09:33:34 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the vfs tree, today's linux-next build (arm
> > multi_v7_defconfig) produced this warning:
> > 
> > In file included from include/linux/printk.h:7,
> >                  from include/linux/kernel.h:14,
> >                  from include/linux/fs_context.h:15,
> >                  from fs/fs_parser.c:13:
> > fs/fs_parser.c: In function 'fs_validate_description':
> > include/linux/kern_levels.h:5:18: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'int' [-Wformat=]
> >  #define KERN_SOH "\001"  /* ASCII Start Of Header */
> >                   ^~~~~~
> > include/linux/kern_levels.h:11:18: note: in expansion of macro 'KERN_SOH'
> >  #define KERN_ERR KERN_SOH "3" /* error conditions */
> >                   ^~~~~~~~
> > include/linux/printk.h:303:9: note: in expansion of macro 'KERN_ERR'
> >   printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
> >          ^~~~~~~~
> > fs/fs_parser.c:413:6: note: in expansion of macro 'pr_err'
> >       pr_err("VALIDATE %s: e[%lu] enum val for %s\n",
> >       ^~~~~~
> > fs/fs_parser.c:413:31: note: format string is defined here
> >       pr_err("VALIDATE %s: e[%lu] enum val for %s\n",
> >                              ~~^
> >                              %u
> > 
> > Introduced by commit
> > 
> >   f512b838c104 ("vfs: Add configuration parser helpers")  
> 
> We are now seeing that warning in Linus' tree :-(

I am still getting the above warning ...

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1510 bytes --]

Hi all,

On Mon, 4 Feb 2019 09:33:34 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the vfs tree, today's linux-next build (arm
> multi_v7_defconfig) produced this warning:
> 
> In file included from include/linux/printk.h:7,
>                  from include/linux/kernel.h:14,
>                  from include/linux/fs_context.h:15,
>                  from fs/fs_parser.c:13:
> fs/fs_parser.c: In function 'fs_validate_description':
> include/linux/kern_levels.h:5:18: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'int' [-Wformat=]
>  #define KERN_SOH "\001"  /* ASCII Start Of Header */
>                   ^~~~~~
> include/linux/kern_levels.h:11:18: note: in expansion of macro 'KERN_SOH'
>  #define KERN_ERR KERN_SOH "3" /* error conditions */
>                   ^~~~~~~~
> include/linux/printk.h:303:9: note: in expansion of macro 'KERN_ERR'
>   printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
>          ^~~~~~~~
> fs/fs_parser.c:413:6: note: in expansion of macro 'pr_err'
>       pr_err("VALIDATE %s: e[%lu] enum val for %s\n",
>       ^~~~~~
> fs/fs_parser.c:413:31: note: format string is defined here
>       pr_err("VALIDATE %s: e[%lu] enum val for %s\n",
>                              ~~^
>                              %u
> 
> Introduced by commit
> 
>   f512b838c104 ("vfs: Add configuration parser helpers")

We are now seeing that warning in Linus' tree :-(

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1315 bytes --]

Hi Al,

After merging the vfs tree, today's linux-next build (arm
multi_v7_defconfig) produced this warning:

In file included from include/linux/printk.h:7,
                 from include/linux/kernel.h:14,
                 from include/linux/fs_context.h:15,
                 from fs/fs_parser.c:13:
fs/fs_parser.c: In function 'fs_validate_description':
include/linux/kern_levels.h:5:18: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'int' [-Wformat=]
 #define KERN_SOH "\001"  /* ASCII Start Of Header */
                  ^~~~~~
include/linux/kern_levels.h:11:18: note: in expansion of macro 'KERN_SOH'
 #define KERN_ERR KERN_SOH "3" /* error conditions */
                  ^~~~~~~~
include/linux/printk.h:303:9: note: in expansion of macro 'KERN_ERR'
  printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
         ^~~~~~~~
fs/fs_parser.c:413:6: note: in expansion of macro 'pr_err'
      pr_err("VALIDATE %s: e[%lu] enum val for %s\n",
      ^~~~~~
fs/fs_parser.c:413:31: note: format string is defined here
      pr_err("VALIDATE %s: e[%lu] enum val for %s\n",
                             ~~^
                             %u

Introduced by commit

  f512b838c104 ("vfs: Add configuration parser helpers")

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build warning after merge of the vfs tree

[David Howells]

Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) produced this warning:
> 
> security/selinux/hooks.c:2835:12: warning: 'selinux_sb_remount' defined but not used [-Wunused-function]
>  static int selinux_sb_remount(struct super_block *sb, void *data, size_t data_size)
>             ^~~~~~~~~~~~~~~~~~
> 
> Introduced by commit
> 
>   dfcf373eab92 ("vfs: Remove unused code after filesystem context changes")

Sorry, I forgot to remove the function.  It's no longer used, with the checks
being done in selinux_validate_for_sb_reconfigure() now, called indirectly
from the ->fs_context_validate() hook.

David

linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 559 bytes --]

Hi all,

After merging the net-next tree, today's linux-next build (x86_64
allmodconfig) produced this warning:

security/selinux/hooks.c:2835:12: warning: 'selinux_sb_remount' defined but not used [-Wunused-function]
 static int selinux_sb_remount(struct super_block *sb, void *data, size_t data_size)
            ^~~~~~~~~~~~~~~~~~

Introduced by commit

  dfcf373eab92 ("vfs: Remove unused code after filesystem context changes")

[For some reason this warning only appeared after I merged the net-next tree.]
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1283 bytes --]

Hi all,

After merging the vfs tree, today's linux-next build (powerpc
ppc64_defconfig) produced this warning:

In file included from arch/powerpc/include/asm/thread_info.h:27:0,
                 from include/linux/thread_info.h:38,
                 from include/asm-generic/preempt.h:5,
                 from ./arch/powerpc/include/generated/asm/preempt.h:1,
                 from include/linux/preempt.h:81,
                 from include/linux/spinlock.h:51,
                 from include/linux/wait.h:9,
                 from include/linux/wait_bit.h:8,
                 from include/linux/fs.h:6,
                 from include/uapi/linux/aio_abi.h:31,
                 from include/linux/syscalls.h:74,
                 from fs/statfs.c:2:
fs/statfs.c: In function 'fsinfo_generic_limits':
arch/powerpc/include/asm/page.h:38:20: warning: large integer implicitly truncated to unsigned type [-Woverflow]
 #define PAGE_SIZE  (ASM_CONST(1) << PAGE_SHIFT)
                    ^
fs/statfs.c:448:25: note: in expansion of macro 'PAGE_SIZE'
  lim->max_symlink_len = PAGE_SIZE;
                         ^~~~~~~~~

Introduced by commit

  4afa2cf6f155 ("fsinfo: Add a system call to allow querying of filesystem information")

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 626 bytes --]

Hi Al,

After merging the vfs tree, today's linux-next build (arm
multi_v7_defconfig) produced this warning:

<stdin>:1338:2: warning: #warning syscall open_tree not implemented [-Wcpp]
<stdin>:1341:2: warning: #warning syscall move_mount not implemented [-Wcpp]
<stdin>:1344:2: warning: #warning syscall fsopen not implemented [-Wcpp]
<stdin>:1347:2: warning: #warning syscall fsmount not implemented [-Wcpp]
<stdin>:1350:2: warning: #warning syscall fspick not implemented [-Wcpp]
<stdin>:1353:2: warning: #warning syscall fsinfo not implemented [-Wcpp]

Not really suprising.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build warning after merge of the vfs tree

[Christoph Hellwig]

On Thu, May 17, 2018 at 10:39:32AM +1000, Stephen Rothwell wrote:
> Hi Al,
> 
> After merging the vfs tree, today's linux-next build (x86_64 allmodconfig)
> produced this warning:
> 
> drivers/isdn/gigaset/capi.c:2344:14: warning: 'gigaset_procinfo' defined but not used [-Wunused-function]
>  static char *gigaset_procinfo(struct capi_ctr *ctr)

The assignment for it was incorrectly removed.  I'll send a set of fixes
to Al.

linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 428 bytes --]

Hi Al,

After merging the vfs tree, today's linux-next build (x86_64 allmodconfig)
produced this warning:

drivers/isdn/gigaset/capi.c:2344:14: warning: 'gigaset_procinfo' defined but not used [-Wunused-function]
 static char *gigaset_procinfo(struct capi_ctr *ctr)
              ^~~~~~~~~~~~~~~~

Introduced by commit

  2cd1f0ddbb56 ("isdn: replace ->proc_fops with ->proc_show")

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 368 bytes --]

Hi all,

After merging the vfs tree, today's linux-next build (arm
multi_v7_defconfig and others) produced this warning:

<stdin>:1332:2: warning: #warning syscall io_pgetevents not implemented [-Wcpp]

Introduced by commit

  7a074e96dee6 ("aio: implement io_pgetevents")

Just a heads up to all the other architectures.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

Hi Al,

On Fri, 8 Sep 2017 09:25:45 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the vfs tree, today's linux-next build (powerpc
> ppc64_defconfig) produced this warning:
> 
> kernel/signal.c: In function 'C_SYSC_rt_sigaction':
> kernel/signal.c:3405:19: warning: unused variable 'mask' [-Wunused-variable]
>    compat_sigset_t mask;
>                    ^
> 
> Introduced by commit
> 
>   fc271087ebcb ("signal: replace sigset_to_compat() with put_compat_sigset()")

I am still getting this warning ...
-- 
Cheers,
Stephen Rothwell

Re: linux-next: build warning after merge of the vfs tree

[Dmitry V. Levin]

[-- Attachment #1: Type: text/plain, Size: 612 bytes --]

Hi,

On Fri, Sep 08, 2017 at 09:25:45AM +1000, Stephen Rothwell wrote:
> Hi Al,
> 
> After merging the vfs tree, today's linux-next build (powerpc
> ppc64_defconfig) produced this warning:
> 
> kernel/signal.c: In function 'C_SYSC_rt_sigaction':
> kernel/signal.c:3405:19: warning: unused variable 'mask' [-Wunused-variable]
>    compat_sigset_t mask;
>                    ^
> 
> Introduced by commit
> 
>   fc271087ebcb ("signal: replace sigset_to_compat() with put_compat_sigset()")

Thanks.  The commit that made this variable unused is
  9b24ec57688a ("get_compat_sigset()")


-- 
ldv

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

Hi Al,

After merging the vfs tree, today's linux-next build (powerpc
ppc64_defconfig) produced this warning:

kernel/signal.c: In function 'C_SYSC_rt_sigaction':
kernel/signal.c:3405:19: warning: unused variable 'mask' [-Wunused-variable]
   compat_sigset_t mask;
                   ^

Introduced by commit

  fc271087ebcb ("signal: replace sigset_to_compat() with put_compat_sigset()")

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

Hi Al,

On Mon, 3 Jul 2017 10:53:47 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the vfs tree, today's linux-next build (x86_64 allmodconfig)
> produced this warning:
> 
> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c: In function 'kiblnd_send':
> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c:1643:2: warning: ignoring return value of 'copy_from_iter', declared with attribute warn_unused_result [-Wunused-result]
>   copy_from_iter(&ibmsg->ibm_u.immediate.ibim_payload, IBLND_MSG_SIZE,
>   ^
> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c: In function 'kiblnd_recv':
> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c:1744:3: warning: ignoring return value of 'copy_to_iter', declared with attribute warn_unused_result [-Wunused-result]
>    copy_to_iter(&rxmsg->ibm_u.immediate.ibim_payload,
>    ^
> 
> Introduced by commit
> 
>   aa28de275a24 ("iov_iter/hardening: move object size checks to inlined part")

These are now in Linus' tree ...
-- 
Cheers,
Stephen Rothwell

linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

Hi Al,

After merging the vfs tree, today's linux-next build (x86_64 allmodconfig)
produced this warning:

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c: In function 'kiblnd_send':
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c:1643:2: warning: ignoring return value of 'copy_from_iter', declared with attribute warn_unused_result [-Wunused-result]
  copy_from_iter(&ibmsg->ibm_u.immediate.ibim_payload, IBLND_MSG_SIZE,
  ^
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c: In function 'kiblnd_recv':
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c:1744:3: warning: ignoring return value of 'copy_to_iter', declared with attribute warn_unused_result [-Wunused-result]
   copy_to_iter(&rxmsg->ibm_u.immediate.ibim_payload,
   ^

Introduced by commit

  aa28de275a24 ("iov_iter/hardening: move object size checks to inlined part")

-- 
Cheers,
Stephen Rothwell

linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 453 bytes --]

Hi Al,

After merging the vfs tree, today's linux-next build (powerpc
ppc64_defconfig) produced this warning:

fs/nfs/file.c:677:9: warning: unused variable 'pos' [-Wunused-variable]
  loff_t pos = iocb->ki_pos;
         ^

Introduced by commit f52cbe4c9838 ("nfs: generic_write_checks()
shouldn't be done on swapout...") which removed the last non debug use
of "pos".
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 621 bytes --]

Hi Al,

After merging the vfs tree, today's linux-next build (powerpc allnoconfig)
produced this warning:

fs/namespace.c: In function 'do_mount':
fs/namespace.c:2219:8: warning: passing argument 3 of 'security_sb_mount' discards 'const' qualifier from pointer target type [enabled by default]
include/linux/security.h:1967:19: note: expected 'char *' but argument is of type 'const char *'

Introduced by commit 5804bc88667e ("consitify do_mount() arguments").
The prototype of the !CONFIG_SECURITY version was not completely updated.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 731 bytes --]

Hi Al,

After merging the vfs tree, today's linux-next build (powerpc
ppc64_defconfig) produced this warning:

kernel/events/core.c: In function 'perf_ioctl':
kernel/events/core.c:3285:17: warning: 'output.file' may be used uninitialized in this function [-Wuninitialized]
include/linux/file.h:36:5: warning: '*((void *)&output+8)' may be used uninitialized in this function [-Wuninitialized]
kernel/events/core.c:3281:14: note: '*((void *)&output+8)' was declared here

Introduced by commit 19ba95358327 ("switch simple cases of fget_light to
fdget").  perf_fget_light() takes the address of a struct fd * but does
not do anything with it ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build warning after merge of the vfs tree

[Jan Kara]

On Thu 05-01-12 08:14:18, Al Viro wrote:
> On Thu, Jan 05, 2012 at 08:06:57AM +0000, Al Viro wrote:
> > On Thu, Jan 05, 2012 at 05:35:21PM +1100, Stephen Rothwell wrote:
> > > Hi Al,
> > > 
> > > After merging the vfs tree, today's linux-next build (powerpc
> > > ppc64_defconfig) produced this warning:
> > > 
> > > fs/reiserfs/super.c:701:2: warning: initialization from incompatible pointer type [enabled by default]
> > > fs/reiserfs/super.c:701:2: warning: (near initialization for 'reiserfs_sops.show_options') [enabled by default]
> > > 
> > > Caused by commit 2ddeb2a58b11 ("vfs: switch ->show_options() to struct
> > > dentry *") interacting with commit f1823b7b87d1 ("reiserfs: Properly
> > > display mount options in /proc/mounts") from the ext3.  This needs some
> > > merge fix ... (and will probably currently cause crashes :-()
> > 
> > Grrr...  Same as changes in the first commit, done to the function introduced
> > by the second (i.e. replace mnt->mnt_sb with dentry->d_sb).  Incidentally,
> > what are reiserfs patches doing in ext3 tree, of all places?
> 
> FWIW, an updated variant of Jan's patch would be this (on top of
> vfs.git#for-next; I can pull his commit there in such form):
  Thanks. I'm removing the old version of the patch from my tree so please
carry the new version in your tree. I was just carrying the patch because
of lack of reiserfs maintainer and because I originally wrote the patch to
accommodate needs of quota tools...

								Honza

-- 
Jan Kara <jack@suse.cz>
SUSE Labs, CR

Re: linux-next: build warning after merge of the vfs tree

[Al Viro]

On Thu, Jan 05, 2012 at 07:14:34PM +1100, Stephen Rothwell wrote:
> > by the second (i.e. replace mnt->mnt_sb with dentry->d_sb).  Incidentally,
> 
> OK, I may apply that fix tomorrow.

FWIW, incremental is simply

--- a/fs/reiserfs/super.c	2012-01-05 03:18:03.000000000 -0500
+++ b/fs/reiserfs/super.c	2012-01-05 03:09:45.000000000 -0500
@@ -598,9 +598,9 @@
 	reiserfs_write_unlock_once(inode->i_sb, lock_depth);
 }
 
-static int reiserfs_show_options(struct seq_file *seq, struct vfsmount *vfs)
+static int reiserfs_show_options(struct seq_file *seq, struct dentry *root)
 {
-	struct super_block *s = vfs->mnt_sb;
+	struct super_block *s = root->d_sb;
 	struct reiserfs_journal *journal = SB_JOURNAL(s);
 	long opts = REISERFS_SB(s)->s_mount_opt;
 

Re: linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1211 bytes --]

Hi Al,

On Thu, 5 Jan 2012 08:06:57 +0000 Al Viro <viro@ZenIV.linux.org.uk> wrote:
>
> On Thu, Jan 05, 2012 at 05:35:21PM +1100, Stephen Rothwell wrote:
> > 
> > After merging the vfs tree, today's linux-next build (powerpc
> > ppc64_defconfig) produced this warning:
> > 
> > fs/reiserfs/super.c:701:2: warning: initialization from incompatible pointer type [enabled by default]
> > fs/reiserfs/super.c:701:2: warning: (near initialization for 'reiserfs_sops.show_options') [enabled by default]
> > 
> > Caused by commit 2ddeb2a58b11 ("vfs: switch ->show_options() to struct
> > dentry *") interacting with commit f1823b7b87d1 ("reiserfs: Properly
> > display mount options in /proc/mounts") from the ext3.  This needs some
> > merge fix ... (and will probably currently cause crashes :-()
> 
> Grrr...  Same as changes in the first commit, done to the function introduced
> by the second (i.e. replace mnt->mnt_sb with dentry->d_sb).  Incidentally,

OK, I may apply that fix tomorrow.

> what are reiserfs patches doing in ext3 tree, of all places?

Its also the quota tree?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build warning after merge of the vfs tree

[Al Viro]

On Thu, Jan 05, 2012 at 08:06:57AM +0000, Al Viro wrote:
> On Thu, Jan 05, 2012 at 05:35:21PM +1100, Stephen Rothwell wrote:
> > Hi Al,
> > 
> > After merging the vfs tree, today's linux-next build (powerpc
> > ppc64_defconfig) produced this warning:
> > 
> > fs/reiserfs/super.c:701:2: warning: initialization from incompatible pointer type [enabled by default]
> > fs/reiserfs/super.c:701:2: warning: (near initialization for 'reiserfs_sops.show_options') [enabled by default]
> > 
> > Caused by commit 2ddeb2a58b11 ("vfs: switch ->show_options() to struct
> > dentry *") interacting with commit f1823b7b87d1 ("reiserfs: Properly
> > display mount options in /proc/mounts") from the ext3.  This needs some
> > merge fix ... (and will probably currently cause crashes :-()
> 
> Grrr...  Same as changes in the first commit, done to the function introduced
> by the second (i.e. replace mnt->mnt_sb with dentry->d_sb).  Incidentally,
> what are reiserfs patches doing in ext3 tree, of all places?

FWIW, an updated variant of Jan's patch would be this (on top of
vfs.git#for-next; I can pull his commit there in such form):

diff --git a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c
index d1aca1d..a945cd2 100644
--- a/fs/reiserfs/bitmap.c
+++ b/fs/reiserfs/bitmap.c
@@ -13,6 +13,7 @@
 #include <linux/reiserfs_fs_sb.h>
 #include <linux/reiserfs_fs_i.h>
 #include <linux/quotaops.h>
+#include <linux/seq_file.h>
 
 #define PREALLOCATION_SIZE 9
 
@@ -634,6 +635,96 @@ int reiserfs_parse_alloc_options(struct super_block *s, char *options)
 	return 0;
 }
 
+static void print_sep(struct seq_file *seq, int *first)
+{
+	if (!*first)
+		seq_puts(seq, ":");
+	else
+		*first = 0;
+}
+
+void show_alloc_options(struct seq_file *seq, struct super_block *s)
+{
+	int first = 1;
+
+	if (SB_ALLOC_OPTS(s) == ((1 << _ALLOC_skip_busy) |
+		(1 << _ALLOC_dirid_groups) | (1 << _ALLOC_packing_groups)))
+		return;
+
+	seq_puts(seq, ",alloc=");
+
+	if (TEST_OPTION(concentrating_formatted_nodes, s)) {
+		print_sep(seq, &first);
+		if (REISERFS_SB(s)->s_alloc_options.border != 10) {
+			seq_printf(seq, "concentrating_formatted_nodes=%d",
+				100 / REISERFS_SB(s)->s_alloc_options.border);
+		} else
+			seq_puts(seq, "concentrating_formatted_nodes");
+	}
+	if (TEST_OPTION(displacing_large_files, s)) {
+		print_sep(seq, &first);
+		if (REISERFS_SB(s)->s_alloc_options.large_file_size != 16) {
+			seq_printf(seq, "displacing_large_files=%lu",
+			    REISERFS_SB(s)->s_alloc_options.large_file_size);
+		} else
+			seq_puts(seq, "displacing_large_files");
+	}
+	if (TEST_OPTION(displacing_new_packing_localities, s)) {
+		print_sep(seq, &first);
+		seq_puts(seq, "displacing_new_packing_localities");
+	}
+	if (TEST_OPTION(old_hashed_relocation, s)) {
+		print_sep(seq, &first);
+		seq_puts(seq, "old_hashed_relocation");
+	}
+	if (TEST_OPTION(new_hashed_relocation, s)) {
+		print_sep(seq, &first);
+		seq_puts(seq, "new_hashed_relocation");
+	}
+	if (TEST_OPTION(dirid_groups, s)) {
+		print_sep(seq, &first);
+		seq_puts(seq, "dirid_groups");
+	}
+	if (TEST_OPTION(oid_groups, s)) {
+		print_sep(seq, &first);
+		seq_puts(seq, "oid_groups");
+	}
+	if (TEST_OPTION(packing_groups, s)) {
+		print_sep(seq, &first);
+		seq_puts(seq, "packing_groups");
+	}
+	if (TEST_OPTION(hashed_formatted_nodes, s)) {
+		print_sep(seq, &first);
+		seq_puts(seq, "hashed_formatted_nodes");
+	}
+	if (TEST_OPTION(skip_busy, s)) {
+		print_sep(seq, &first);
+		seq_puts(seq, "skip_busy");
+	}
+	if (TEST_OPTION(hundredth_slices, s)) {
+		print_sep(seq, &first);
+		seq_puts(seq, "hundredth_slices");
+	}
+	if (TEST_OPTION(old_way, s)) {
+		print_sep(seq, &first);
+		seq_puts(seq, "old_way");
+	}
+	if (TEST_OPTION(displace_based_on_dirid, s)) {
+		print_sep(seq, &first);
+		seq_puts(seq, "displace_based_on_dirid");
+	}
+	if (REISERFS_SB(s)->s_alloc_options.preallocmin != 0) {
+		print_sep(seq, &first);
+		seq_printf(seq, "preallocmin=%d",
+				REISERFS_SB(s)->s_alloc_options.preallocmin);
+	}
+	if (REISERFS_SB(s)->s_alloc_options.preallocsize != 17) {
+		print_sep(seq, &first);
+		seq_printf(seq, "preallocsize=%d",
+				REISERFS_SB(s)->s_alloc_options.preallocsize);
+	}
+}
+
 static inline void new_hashed_relocation(reiserfs_blocknr_hint_t * hint)
 {
 	char *hash_in;
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 1abffa4..19c454e 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -28,6 +28,7 @@
 #include <linux/mount.h>
 #include <linux/namei.h>
 #include <linux/crc32.h>
+#include <linux/seq_file.h>
 
 struct file_system_type reiserfs_fs_type;
 
@@ -61,6 +62,7 @@ static int is_any_reiserfs_magic_string(struct reiserfs_super_block *rs)
 
 static int reiserfs_remount(struct super_block *s, int *flags, char *data);
 static int reiserfs_statfs(struct dentry *dentry, struct kstatfs *buf);
+void show_alloc_options(struct seq_file *seq, struct super_block *s);
 
 static int reiserfs_sync_fs(struct super_block *s, int wait)
 {
@@ -596,6 +598,82 @@ out:
 	reiserfs_write_unlock_once(inode->i_sb, lock_depth);
 }
 
+static int reiserfs_show_options(struct seq_file *seq, struct dentry *root)
+{
+	struct super_block *s = root->d_sb;
+	struct reiserfs_journal *journal = SB_JOURNAL(s);
+	long opts = REISERFS_SB(s)->s_mount_opt;
+
+	if (opts & (1 << REISERFS_LARGETAIL))
+		seq_puts(seq, ",tails=on");
+	else if (!(opts & (1 << REISERFS_SMALLTAIL)))
+		seq_puts(seq, ",notail");
+	/* tails=small is default so we don't show it */
+
+	if (!(opts & (1 << REISERFS_BARRIER_FLUSH)))
+		seq_puts(seq, ",barrier=none");
+	/* barrier=flush is default so we don't show it */
+
+	if (opts & (1 << REISERFS_ERROR_CONTINUE))
+		seq_puts(seq, ",errors=continue");
+	else if (opts & (1 << REISERFS_ERROR_PANIC))
+		seq_puts(seq, ",errors=panic");
+	/* errors=ro is default so we don't show it */
+
+	if (opts & (1 << REISERFS_DATA_LOG))
+		seq_puts(seq, ",data=journal");
+	else if (opts & (1 << REISERFS_DATA_WRITEBACK))
+		seq_puts(seq, ",data=writeback");
+	/* data=ordered is default so we don't show it */
+
+	if (opts & (1 << REISERFS_ATTRS))
+		seq_puts(seq, ",attrs");
+
+	if (opts & (1 << REISERFS_XATTRS_USER))
+		seq_puts(seq, ",user_xattr");
+
+	if (opts & (1 << REISERFS_EXPOSE_PRIVROOT))
+		seq_puts(seq, ",expose_privroot");
+
+	if (opts & (1 << REISERFS_POSIXACL))
+		seq_puts(seq, ",acl");
+
+	if (REISERFS_SB(s)->s_jdev)
+		seq_printf(seq, ",jdev=%s", REISERFS_SB(s)->s_jdev);
+
+	if (journal->j_max_commit_age != journal->j_default_max_commit_age)
+		seq_printf(seq, ",commit=%d", journal->j_max_commit_age);
+
+#ifdef CONFIG_QUOTA
+	if (REISERFS_SB(s)->s_qf_names[USRQUOTA])
+		seq_printf(seq, ",usrjquota=%s", REISERFS_SB(s)->s_qf_names[USRQUOTA]);
+	else if (opts & (1 << REISERFS_USRQUOTA))
+		seq_puts(seq, ",usrquota");
+	if (REISERFS_SB(s)->s_qf_names[GRPQUOTA])
+		seq_printf(seq, ",grpjquota=%s", REISERFS_SB(s)->s_qf_names[GRPQUOTA]);
+	else if (opts & (1 << REISERFS_GRPQUOTA))
+		seq_puts(seq, ",grpquota");
+	if (REISERFS_SB(s)->s_jquota_fmt) {
+		if (REISERFS_SB(s)->s_jquota_fmt == QFMT_VFS_OLD)
+			seq_puts(seq, ",jqfmt=vfsold");
+		else if (REISERFS_SB(s)->s_jquota_fmt == QFMT_VFS_V0)
+			seq_puts(seq, ",jqfmt=vfsv0");
+	}
+#endif
+
+	/* Block allocator options */
+	if (opts & (1 << REISERFS_NO_BORDER))
+		seq_puts(seq, ",block-allocator=noborder");
+	if (opts & (1 << REISERFS_NO_UNHASHED_RELOCATION))
+		seq_puts(seq, ",block-allocator=no_unhashed_relocation");
+	if (opts & (1 << REISERFS_HASHED_RELOCATION))
+		seq_puts(seq, ",block-allocator=hashed_relocation");
+	if (opts & (1 << REISERFS_TEST4))
+		seq_puts(seq, ",block-allocator=test4");
+	show_alloc_options(seq, s);
+	return 0;
+}
+
 #ifdef CONFIG_QUOTA
 static ssize_t reiserfs_quota_write(struct super_block *, int, const char *,
 				    size_t, loff_t);
@@ -616,7 +694,7 @@ static const struct super_operations reiserfs_sops = {
 	.unfreeze_fs = reiserfs_unfreeze,
 	.statfs = reiserfs_statfs,
 	.remount_fs = reiserfs_remount,
-	.show_options = generic_show_options,
+	.show_options = reiserfs_show_options,
 #ifdef CONFIG_QUOTA
 	.quota_read = reiserfs_quota_read,
 	.quota_write = reiserfs_quota_write,
@@ -914,9 +992,9 @@ static int reiserfs_parse_options(struct super_block *s, char *options,	/* strin
 		{"jdev",.arg_required = 'j',.values = NULL},
 		{"nolargeio",.arg_required = 'w',.values = NULL},
 		{"commit",.arg_required = 'c',.values = NULL},
-		{"usrquota",.setmask = 1 << REISERFS_QUOTA},
-		{"grpquota",.setmask = 1 << REISERFS_QUOTA},
-		{"noquota",.clrmask = 1 << REISERFS_QUOTA},
+		{"usrquota",.setmask = 1 << REISERFS_USRQUOTA},
+		{"grpquota",.setmask = 1 << REISERFS_GRPQUOTA},
+		{"noquota",.clrmask = 1 << REISERFS_USRQUOTA | 1 << REISERFS_GRPQUOTA},
 		{"errors",.arg_required = 'e',.values = error_actions},
 		{"usrjquota",.arg_required =
 		 'u' | (1 << REISERFS_OPT_ALLOWEMPTY),.values = NULL},
@@ -1030,12 +1108,19 @@ static int reiserfs_parse_options(struct super_block *s, char *options,	/* strin
 					return 0;
 				}
 				strcpy(qf_names[qtype], arg);
-				*mount_options |= 1 << REISERFS_QUOTA;
+				if (qtype == USRQUOTA)
+					*mount_options |= 1 << REISERFS_USRQUOTA;
+				else
+					*mount_options |= 1 << REISERFS_GRPQUOTA;
 			} else {
 				if (qf_names[qtype] !=
 				    REISERFS_SB(s)->s_qf_names[qtype])
 					kfree(qf_names[qtype]);
 				qf_names[qtype] = NULL;
+				if (qtype == USRQUOTA)
+					*mount_options &= ~(1 << REISERFS_USRQUOTA);
+				else
+					*mount_options &= ~(1 << REISERFS_GRPQUOTA);
 			}
 		}
 		if (c == 'f') {
@@ -1074,9 +1159,10 @@ static int reiserfs_parse_options(struct super_block *s, char *options,	/* strin
 				 "journaled quota format not specified.");
 		return 0;
 	}
-	/* This checking is not precise wrt the quota type but for our purposes it is sufficient */
-	if (!(*mount_options & (1 << REISERFS_QUOTA))
-	    && sb_any_quota_loaded(s)) {
+	if ((!(*mount_options & (1 << REISERFS_USRQUOTA)) &&
+	       sb_has_quota_loaded(s, USRQUOTA)) ||
+	    (!(*mount_options & (1 << REISERFS_GRPQUOTA)) &&
+	       sb_has_quota_loaded(s, GRPQUOTA))) {
 		reiserfs_warning(s, "super-6516", "quota options must "
 				 "be present when quota is turned on.");
 		return 0;
@@ -1224,7 +1310,8 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg)
 	safe_mask |= 1 << REISERFS_ERROR_RO;
 	safe_mask |= 1 << REISERFS_ERROR_CONTINUE;
 	safe_mask |= 1 << REISERFS_ERROR_PANIC;
-	safe_mask |= 1 << REISERFS_QUOTA;
+	safe_mask |= 1 << REISERFS_USRQUOTA;
+	safe_mask |= 1 << REISERFS_GRPQUOTA;
 
 	/* Update the bitmask, taking care to keep
 	 * the bits we're not allowed to change here */
@@ -1671,6 +1758,14 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
 	     &commit_max_age, qf_names, &qfmt) == 0) {
 		goto error;
 	}
+	if (jdev_name && jdev_name[0]) {
+		REISERFS_SB(s)->s_jdev = kstrdup(jdev_name, GFP_KERNEL);
+		if (!REISERFS_SB(s)->s_jdev) {
+			SWARN(silent, s, "", "Cannot allocate memory for "
+				"journal device name");
+			goto error;
+		}
+	}
 #ifdef CONFIG_QUOTA
 	handle_quota_files(s, qf_names, &qfmt);
 #endif
@@ -2053,8 +2148,9 @@ static int reiserfs_quota_on(struct super_block *sb, int type, int format_id,
 	int err;
 	struct inode *inode;
 	struct reiserfs_transaction_handle th;
+	int opt = type == USRQUOTA ? REISERFS_USRQUOTA : REISERFS_GRPQUOTA;
 
-	if (!(REISERFS_SB(sb)->s_mount_opt & (1 << REISERFS_QUOTA)))
+	if (!(REISERFS_SB(sb)->s_mount_opt & (1 << opt)))
 		return -EINVAL;
 
 	/* Quotafile not on the same filesystem? */
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index 26be28f..2213ddc 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -1759,13 +1759,14 @@ struct reiserfs_journal_header {
 					      REISERFS_QUOTA_TRANS_BLOCKS(sb)))
 
 #ifdef CONFIG_QUOTA
+#define REISERFS_QUOTA_OPTS ((1 << REISERFS_USRQUOTA) | (1 << REISERFS_GRPQUOTA))
 /* We need to update data and inode (atime) */
-#define REISERFS_QUOTA_TRANS_BLOCKS(s) (REISERFS_SB(s)->s_mount_opt & (1<<REISERFS_QUOTA) ? 2 : 0)
+#define REISERFS_QUOTA_TRANS_BLOCKS(s) (REISERFS_SB(s)->s_mount_opt & REISERFS_QUOTA_OPTS ? 2 : 0)
 /* 1 balancing, 1 bitmap, 1 data per write + stat data update */
-#define REISERFS_QUOTA_INIT_BLOCKS(s) (REISERFS_SB(s)->s_mount_opt & (1<<REISERFS_QUOTA) ? \
+#define REISERFS_QUOTA_INIT_BLOCKS(s) (REISERFS_SB(s)->s_mount_opt & REISERFS_QUOTA_OPTS ? \
 (DQUOT_INIT_ALLOC*(JOURNAL_PER_BALANCE_CNT+2)+DQUOT_INIT_REWRITE+1) : 0)
 /* same as with INIT */
-#define REISERFS_QUOTA_DEL_BLOCKS(s) (REISERFS_SB(s)->s_mount_opt & (1<<REISERFS_QUOTA) ? \
+#define REISERFS_QUOTA_DEL_BLOCKS(s) (REISERFS_SB(s)->s_mount_opt & REISERFS_QUOTA_OPTS ? \
 (DQUOT_DEL_ALLOC*(JOURNAL_PER_BALANCE_CNT+2)+DQUOT_DEL_REWRITE+1) : 0)
 #else
 #define REISERFS_QUOTA_TRANS_BLOCKS(s) 0
diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
index 52c83b6..8c9e85c 100644
--- a/include/linux/reiserfs_fs_sb.h
+++ b/include/linux/reiserfs_fs_sb.h
@@ -417,6 +417,7 @@ struct reiserfs_sb_info {
 	char *s_qf_names[MAXQUOTAS];
 	int s_jquota_fmt;
 #endif
+	char *s_jdev;		/* Stored jdev for mount option showing */
 #ifdef CONFIG_REISERFS_CHECK
 
 	struct tree_balance *cur_tb;	/*
@@ -482,7 +483,8 @@ enum reiserfs_mount_options {
 	REISERFS_ERROR_RO,
 	REISERFS_ERROR_CONTINUE,
 
-	REISERFS_QUOTA,		/* Some quota option specified */
+	REISERFS_USRQUOTA,	/* User quota option specified */
+	REISERFS_GRPQUOTA,	/* Group quota option specified */
 
 	REISERFS_TEST1,
 	REISERFS_TEST2,

Re: linux-next: build warning after merge of the vfs tree

[Al Viro]

On Thu, Jan 05, 2012 at 05:35:21PM +1100, Stephen Rothwell wrote:
> Hi Al,
> 
> After merging the vfs tree, today's linux-next build (powerpc
> ppc64_defconfig) produced this warning:
> 
> fs/reiserfs/super.c:701:2: warning: initialization from incompatible pointer type [enabled by default]
> fs/reiserfs/super.c:701:2: warning: (near initialization for 'reiserfs_sops.show_options') [enabled by default]
> 
> Caused by commit 2ddeb2a58b11 ("vfs: switch ->show_options() to struct
> dentry *") interacting with commit f1823b7b87d1 ("reiserfs: Properly
> display mount options in /proc/mounts") from the ext3.  This needs some
> merge fix ... (and will probably currently cause crashes :-()

Grrr...  Same as changes in the first commit, done to the function introduced
by the second (i.e. replace mnt->mnt_sb with dentry->d_sb).  Incidentally,
what are reiserfs patches doing in ext3 tree, of all places?

linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 722 bytes --]

Hi Al,

After merging the vfs tree, today's linux-next build (powerpc
ppc64_defconfig) produced this warning:

fs/reiserfs/super.c:701:2: warning: initialization from incompatible pointer type [enabled by default]
fs/reiserfs/super.c:701:2: warning: (near initialization for 'reiserfs_sops.show_options') [enabled by default]

Caused by commit 2ddeb2a58b11 ("vfs: switch ->show_options() to struct
dentry *") interacting with commit f1823b7b87d1 ("reiserfs: Properly
display mount options in /proc/mounts") from the ext3.  This needs some
merge fix ... (and will probably currently cause crashes :-()

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build warning after merge of the vfs tree

[Al Viro]

On Mon, Jul 18, 2011 at 06:17:37AM +0100, Al Viro wrote:

> Argh...  There had been several places where ->fsync() change hadn't been
> done in the original patch; I've patched them up, but forgot to change the
> prototype in this one ;-/
> 
> s/file,/& loff_t start, loff_t end,/ in the obvious place; I'll push the
> updated variant in a few.

Fixed and pushed.

Re: linux-next: build warning after merge of the vfs tree

[Al Viro]

On Mon, Jul 18, 2011 at 03:04:56PM +1000, Stephen Rothwell wrote:
> Hi Al,
> 
> After merging the vfs tree, today's linux-next build (powerpc
> ppc64_defconfig) produced this warning:
> 
> drivers/char/ps3flash.c:347:2: warning: initialization from incompatible pointer type
> 
> Introduced by commit 62ec115d5b9c ("fs: push i_mutex and
> filemap_write_and_wait down into ->fsync() handlers").

Argh...  There had been several places where ->fsync() change hadn't been
done in the original patch; I've patched them up, but forgot to change the
prototype in this one ;-/

s/file,/& loff_t start, loff_t end,/ in the obvious place; I'll push the
updated variant in a few.

linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 428 bytes --]

Hi Al,

After merging the vfs tree, today's linux-next build (powerpc
ppc64_defconfig) produced this warning:

drivers/char/ps3flash.c:347:2: warning: initialization from incompatible pointer type

Introduced by commit 62ec115d5b9c ("fs: push i_mutex and
filemap_write_and_wait down into ->fsync() handlers").

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build warning after merge of the vfs tree

[Jeff Layton]

On Mon, 5 Jul 2010 09:10:19 +0100
Al Viro <viro@ZenIV.linux.org.uk> wrote:

> On Mon, Jul 05, 2010 at 10:01:21AM +1000, Stephen Rothwell wrote:
> > Hi Al,
> > 
> > After merging the vfs tree, today's linux-next build (powerpc
> > ppc64_defconfig) produced these warnings:
> > 
> > fs/cifs/cifsfs.c: In function 'cifs_drop_inode':
> > fs/cifs/cifsfs.c:481: warning: 'return' with a value, in function returning void
> > fs/cifs/cifsfs.c:483: warning: 'return' with a value, in function returning void
> > fs/cifs/cifsfs.c: At top level:
> > fs/cifs/cifsfs.c:491: warning: initialization from incompatible pointer type
> > 
> > Introduced by commit 12420ac341533f3715b3deb788637568f22b78ff ("cifs:
> > implement drop_inode superblock op") (which entered Linus' tree on June
> > 28) interacting with commit 1fd3b83deb5125288bee98f32a41c3267b8ed534
> > ("Make ->drop_inode() just return whether inode needs to be dropped")
> > from the vfs tree.  I guess the cifs tree was missed bye the vfs tree
> > update.
> 
> Fixed.  Incidentally, could somebody explain WTF do we put the inodes into
> icache in case !serverino?

Thanks, Al.

We use iunique to generate inode numbers in that case, and I believe
that requires hashed inodes to ensure uniqueness.

-- 
Jeff Layton <jlayton@redhat.com>

Re: linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]

Hi Al,

On Mon, 5 Jul 2010 09:10:19 +0100 Al Viro <viro@ZenIV.linux.org.uk> wrote:
>
> Fixed.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build warning after merge of the vfs tree

[Al Viro]

On Mon, Jul 05, 2010 at 10:01:21AM +1000, Stephen Rothwell wrote:
> Hi Al,
> 
> After merging the vfs tree, today's linux-next build (powerpc
> ppc64_defconfig) produced these warnings:
> 
> fs/cifs/cifsfs.c: In function 'cifs_drop_inode':
> fs/cifs/cifsfs.c:481: warning: 'return' with a value, in function returning void
> fs/cifs/cifsfs.c:483: warning: 'return' with a value, in function returning void
> fs/cifs/cifsfs.c: At top level:
> fs/cifs/cifsfs.c:491: warning: initialization from incompatible pointer type
> 
> Introduced by commit 12420ac341533f3715b3deb788637568f22b78ff ("cifs:
> implement drop_inode superblock op") (which entered Linus' tree on June
> 28) interacting with commit 1fd3b83deb5125288bee98f32a41c3267b8ed534
> ("Make ->drop_inode() just return whether inode needs to be dropped")
> from the vfs tree.  I guess the cifs tree was missed bye the vfs tree
> update.

Fixed.  Incidentally, could somebody explain WTF do we put the inodes into
icache in case !serverino?

linux-next: build warning after merge of the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 917 bytes --]

Hi Al,

After merging the vfs tree, today's linux-next build (powerpc
ppc64_defconfig) produced these warnings:

fs/cifs/cifsfs.c: In function 'cifs_drop_inode':
fs/cifs/cifsfs.c:481: warning: 'return' with a value, in function returning void
fs/cifs/cifsfs.c:483: warning: 'return' with a value, in function returning void
fs/cifs/cifsfs.c: At top level:
fs/cifs/cifsfs.c:491: warning: initialization from incompatible pointer type

Introduced by commit 12420ac341533f3715b3deb788637568f22b78ff ("cifs:
implement drop_inode superblock op") (which entered Linus' tree on June
28) interacting with commit 1fd3b83deb5125288bee98f32a41c3267b8ed534
("Make ->drop_inode() just return whether inode needs to be dropped")
from the vfs tree.  I guess the cifs tree was missed bye the vfs tree
update.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]