linux-next: build failure after merge of the vfs-brauner tree

linux-next: build failure after merge of the vfs-brauner tree

[Stephen Rothwell]

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

Hi all,

After merging the vfs-brauner tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/md/md.c: In function 'md_import_device':
drivers/md/md.c:3635:25: error: unused variable 'holder' [-Werror=unused-variable]
 3635 |         struct md_rdev *holder;
      |                         ^~~~~~
cc1: all warnings being treated as errors

Caused by commit

  15db36126ca6 ("md: Convert to bdev_open_by_dev()")

I have used the vfs-brauner tree from next-20230927 for today.
-- 
Cheers,
Stephen Rothwell

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

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

[Christian Brauner]

On Thu, Sep 28, 2023 at 10:39:54AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the vfs-brauner tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/md/md.c: In function 'md_import_device':
> drivers/md/md.c:3635:25: error: unused variable 'holder' [-Werror=unused-variable]
>  3635 |         struct md_rdev *holder;
>       |                         ^~~~~~
> cc1: all warnings being treated as errors
> 
> Caused by commit
> 
>   15db36126ca6 ("md: Convert to bdev_open_by_dev()")
> 
> I have used the vfs-brauner tree from next-20230927 for today.

Fixed in vfs.super. Thank you!

linux-next: build failure after merge of the vfs-brauner tree

[Stephen Rothwell]

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

Hi all,

After merging the vfs-brauner tree, today's linux-next build (i386
defconfig) failed like this:

In file included from include/linux/kernel.h:31,
                 from include/linux/uio.h:8,
                 from fs/netfs/direct_write.c:9:
fs/netfs/direct_write.c: In function 'netfs_unbuffered_write_iter_locked':
fs/netfs/internal.h:399:36: error: format '%lx' expects argument of type 'long unsigned int', but argument 3 has type 'size_t' {aka 'unsigned int'} [-Werror=format=]
  399 | #define _enter(FMT, ...) no_printk("==> %s("FMT")", __func__, ##__VA_ARGS__)
      |                                    ^~~~~~~~~
include/linux/printk.h:129:25: note: in definition of macro 'no_printk'
  129 |                 _printk(fmt, ##__VA_ARGS__);            \
      |                         ^~~
fs/netfs/direct_write.c:40:9: note: in expansion of macro '_enter'
   40 |         _enter("%lx", iov_iter_count(iter));
      |         ^~~~~~
cc1: all warnings being treated as errors
In file included from include/linux/kernel.h:31,
                 from include/linux/cpumask.h:11,
                 from arch/x86/include/asm/cpumask.h:5,
                 from arch/x86/include/asm/msr.h:11,
                 from arch/x86/include/asm/tsc.h:10,
                 from arch/x86/include/asm/timex.h:6,
                 from include/linux/timex.h:67,
                 from include/linux/time32.h:13,
                 from include/linux/time.h:60,
                 from include/linux/stat.h:19,
                 from include/linux/module.h:13,
                 from net/9p/client.c:11:
net/9p/client.c: In function 'p9_client_write_subreq':
include/linux/kern_levels.h:5:25: error: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'size_t' {aka 'unsigned int'} [-Werror=format=]
    5 | #define KERN_SOH        "\001"          /* ASCII Start Of Header */
      |                         ^~~~~~
include/linux/printk.h:429:25: note: in definition of macro 'printk_index_wrap'
  429 |                 _p_func(_fmt, ##__VA_ARGS__);                           \
      |                         ^~~~
include/linux/printk.h:500:9: note: in expansion of macro 'printk'
  500 |         printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
      |         ^~~~~~
include/linux/kern_levels.h:11:25: note: in expansion of macro 'KERN_SOH'
   11 | #define KERN_ERR        KERN_SOH "3"    /* error conditions */
      |                         ^~~~~~~~
include/linux/printk.h:500:16: note: in expansion of macro 'KERN_ERR'
  500 |         printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
      |                ^~~~~~~~
net/9p/client.c:1702:17: note: in expansion of macro 'pr_err'
 1702 |                 pr_err("bogus RWRITE count (%d > %lu)\n", written, len);
      |                 ^~~~~~
cc1: all warnings being treated as errors

Caused by commits

  1351be4f832e ("netfs, 9p: Implement helpers for new write code")
  671136799613 ("netfs: Remove the old writeback code")

I have applied the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 4 Apr 2024 13:17:42 +1100
Subject: [PATCH] fixup for "netfs, 9p: Implement helpers for new write code"

and "netfs: Remove the old writeback code"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/netfs/direct_write.c | 2 +-
 net/9p/client.c         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/netfs/direct_write.c b/fs/netfs/direct_write.c
index e4a9cf7cd234..a2f9a4917ab6 100644
--- a/fs/netfs/direct_write.c
+++ b/fs/netfs/direct_write.c
@@ -37,7 +37,7 @@ static ssize_t netfs_unbuffered_write_iter_locked(struct kiocb *iocb, struct iov
 	size_t len = iov_iter_count(iter);
 	bool async = !is_sync_kiocb(iocb);
 
-	_enter("%lx", iov_iter_count(iter));
+	_enter("%zx", iov_iter_count(iter));
 
 	/* We're going to need a bounce buffer if what we transmit is going to
 	 * be different in some way to the source buffer, e.g. because it gets
diff --git a/net/9p/client.c b/net/9p/client.c
index dada0033d71e..d4b88b7ff5ef 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -1699,7 +1699,7 @@ p9_client_write_subreq(struct netfs_io_subrequest *subreq)
 	}
 
 	if (written > len) {
-		pr_err("bogus RWRITE count (%d > %lu)\n", written, len);
+		pr_err("bogus RWRITE count (%d > %zu)\n", written, len);
 		written = len;
 	}
 
-- 
2.43.0

-- 
Cheers,
Stephen Rothwell

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

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

[David Howells]

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

> diff --git a/net/9p/client.c b/net/9p/client.c
> index dada0033d71e..d4b88b7ff5ef 100644
> --- a/net/9p/client.c
> +++ b/net/9p/client.c
> @@ -1699,7 +1699,7 @@ p9_client_write_subreq(struct netfs_io_subrequest *subreq)
>  	}
>  
>  	if (written > len) {
> -		pr_err("bogus RWRITE count (%d > %lu)\n", written, len);
> +		pr_err("bogus RWRITE count (%d > %zu)\n", written, len);
>  		written = len;
>  	}

Actually, that's the wrong fix.  'len' needs to be int not size_t because of
the varargs packet formatter.

David

linux-next: build failure after merge of the vfs-brauner tree

[Stephen Rothwell]

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

Hi all,

After merging the vfs-brauner tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

fs/nfsd/nfs4state.c: In function 'nfsd4_deleg_getattr_conflict':
fs/nfsd/nfs4state.c:8845:32: error: 'struct file_lease' has no member named 'fl_owner'
 8845 |                         dp = fl->fl_owner;
      |                                ^~

Caused by commits

  a69ce85ec9af ("filelock: split common fields into struct file_lock_core")
  282c30f320ba ("filelock: remove temporary compatibility macros")

interacting with commit

  b9b89fb3e0b6 ("NFSD: handle GETATTR conflict with write delegation")

from the nfsd tree.

I have applied the following merge resolution patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 19 Feb 2024 10:38:26 +1100
Subject: [PATCH] fixup for "filelock: split common fields into struct
 file_lock_core"

interacting with "NFSD: handle GETATTR conflict with write delegation"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/nfsd/nfs4state.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 3545125c8b73..71bb0ee57cf8 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -8842,7 +8842,7 @@ nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp, struct inode *inode,
 			}
 break_lease:
 			nfsd_stats_wdeleg_getattr_inc(nn);
-			dp = fl->fl_owner;
+			dp = fl->c.flc_owner;
 			ncf = &dp->dl_cb_fattr;
 			nfs4_cb_getattr(&dp->dl_cb_fattr);
 			spin_unlock(&ctx->flc_lock);
-- 
2.43.0

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

On Mon, 19 Feb 2024 10:44:50 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the vfs-brauner tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> fs/nfsd/nfs4state.c: In function 'nfsd4_deleg_getattr_conflict':
> fs/nfsd/nfs4state.c:8845:32: error: 'struct file_lease' has no member named 'fl_owner'
>  8845 |                         dp = fl->fl_owner;
>       |                                ^~
> 
> Caused by commits
> 
>   a69ce85ec9af ("filelock: split common fields into struct file_lock_core")
>   282c30f320ba ("filelock: remove temporary compatibility macros")
> 
> interacting with commit
> 
>   b9b89fb3e0b6 ("NFSD: handle GETATTR conflict with write delegation")
> 
> from the nfsd tree.
> 
> I have applied the following merge resolution patch.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 19 Feb 2024 10:38:26 +1100
> Subject: [PATCH] fixup for "filelock: split common fields into struct
>  file_lock_core"
> 
> interacting with "NFSD: handle GETATTR conflict with write delegation"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  fs/nfsd/nfs4state.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 3545125c8b73..71bb0ee57cf8 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -8842,7 +8842,7 @@ nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp, struct inode *inode,
>  			}
>  break_lease:
>  			nfsd_stats_wdeleg_getattr_inc(nn);
> -			dp = fl->fl_owner;
> +			dp = fl->c.flc_owner;
>  			ncf = &dp->dl_cb_fattr;
>  			nfs4_cb_getattr(&dp->dl_cb_fattr);
>  			spin_unlock(&ctx->flc_lock);
> -- 
> 2.43.0

This is now required in the merge of the nfsd tree with Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

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

[Chuck Lever III]

> On Mar 12, 2024, at 7:41 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Hi all,
> 
> On Mon, 19 Feb 2024 10:44:50 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> 
>> After merging the vfs-brauner tree, today's linux-next build (powerpc
>> ppc64_defconfig) failed like this:
>> 
>> fs/nfsd/nfs4state.c: In function 'nfsd4_deleg_getattr_conflict':
>> fs/nfsd/nfs4state.c:8845:32: error: 'struct file_lease' has no member named 'fl_owner'
>> 8845 |                         dp = fl->fl_owner;
>>      |                                ^~
>> 
>> Caused by commits
>> 
>>  a69ce85ec9af ("filelock: split common fields into struct file_lock_core")
>>  282c30f320ba ("filelock: remove temporary compatibility macros")
>> 
>> interacting with commit
>> 
>>  b9b89fb3e0b6 ("NFSD: handle GETATTR conflict with write delegation")
>> 
>> from the nfsd tree.
>> 
>> I have applied the following merge resolution patch.
>> 
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Mon, 19 Feb 2024 10:38:26 +1100
>> Subject: [PATCH] fixup for "filelock: split common fields into struct
>> file_lock_core"
>> 
>> interacting with "NFSD: handle GETATTR conflict with write delegation"
>> 
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---
>> fs/nfsd/nfs4state.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
>> index 3545125c8b73..71bb0ee57cf8 100644
>> --- a/fs/nfsd/nfs4state.c
>> +++ b/fs/nfsd/nfs4state.c
>> @@ -8842,7 +8842,7 @@ nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp, struct inode *inode,
>> }
>> break_lease:
>> nfsd_stats_wdeleg_getattr_inc(nn);
>> - dp = fl->fl_owner;
>> + dp = fl->c.flc_owner;
>> ncf = &dp->dl_cb_fattr;
>> nfs4_cb_getattr(&dp->dl_cb_fattr);
>> spin_unlock(&ctx->flc_lock);
>> -- 
>> 2.43.0
> 
> This is now required in the merge of the nfsd tree with Linus' tree.

Sorry, I thought Linus was going to address this when he merged
nfsd-next today. What's the preferred resolution?


--
Chuck Lever

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

[Stephen Rothwell]

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

Hi Chuck,

On Tue, 12 Mar 2024 23:45:23 +0000 Chuck Lever III <chuck.lever@oracle.com> wrote:
>
> Sorry, I thought Linus was going to address this when he merged
> nfsd-next today. What's the preferred resolution?

I started this morning before Linus merged your tree.  It's all good
now, thanks.

-- 
Cheers,
Stephen Rothwell

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

linux-next: build failure after merge of the vfs-brauner tree

[Stephen Rothwell]

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

Hi all,

After merging the vfs-brauner tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from include/linux/highmem.h:5,
                 from include/linux/bvec.h:10,
                 from include/linux/blk_types.h:10,
                 from include/linux/blkdev.h:9,
                 from fs/btrfs/super.c:6:
include/linux/fs.h: In function 'super_set_sysfs_name_generic':
include/linux/fs.h:2597:9: error: function 'super_set_sysfs_name_generic' might be a candidate for 'gnu_printf' format attribute [-Werror=suggest-attribute=format]
 2597 |         vsnprintf(sb->s_sysfs_name, sizeof(sb->s_sysfs_name), fmt, args);
      |         ^~~~~~~~~
cc1: all warnings being treated as errors

and many more similar.

Caused by commit

  eeea5d25d4a7 ("fs: add FS_IOC_GETFSSYSFSPATH")

This new finction is not used anywhere, so just remove it for now?

I have used the vfs-brauner tree from next-20240209 for today.

-- 
Cheers,
Stephen Rothwell

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

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

[Kent Overstreet]

On Mon, Feb 12, 2024 at 10:52:37AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the vfs-brauner tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from include/linux/highmem.h:5,
>                  from include/linux/bvec.h:10,
>                  from include/linux/blk_types.h:10,
>                  from include/linux/blkdev.h:9,
>                  from fs/btrfs/super.c:6:
> include/linux/fs.h: In function 'super_set_sysfs_name_generic':
> include/linux/fs.h:2597:9: error: function 'super_set_sysfs_name_generic' might be a candidate for 'gnu_printf' format attribute [-Werror=suggest-attribute=format]
>  2597 |         vsnprintf(sb->s_sysfs_name, sizeof(sb->s_sysfs_name), fmt, args);
>       |         ^~~~~~~~~
> cc1: all warnings being treated as errors
> 
> and many more similar.
> 
> Caused by commit
> 
>   eeea5d25d4a7 ("fs: add FS_IOC_GETFSSYSFSPATH")
> 
> This new finction is not used anywhere, so just remove it for now?

Let's not drop it; people adding support for other filesystems will
probably want it. Here's a fixup patch:

-- >8 --

From baf60243a686b0dca9236110491694bd03378063 Mon Sep 17 00:00:00 2001
From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Sun, 11 Feb 2024 19:34:56 -0500
Subject: [PATCH] fixup! fs: FS_IOC_GETSYSFSPATH


diff --git a/include/linux/fs.h b/include/linux/fs.h
index fb003d9d05af..c6d9e1b7032c 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2574,6 +2574,7 @@ static inline void super_set_sysfs_name_id(struct super_block *sb)
 }
 
 /* try to use something standard before you use this */
+__printf(2, 3)
 static inline void super_set_sysfs_name_generic(struct super_block *sb, const char *fmt, ...)
 {
 	va_list args;

linux-next: build failure after merge of the vfs-brauner tree

[Stephen Rothwell]

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

Hi all,

After merging the vfs-brauner tree, today's linux-next build (powerpc
allnoconfig) failed like this:

In file included from <command-line>:
In function 'i_size_read',
    inlined from '__iomap_dio_rw' at fs/iomap/direct-io.c:570:16:
include/linux/compiler_types.h:435:45: error: call to '__compiletime_assert_229' declared with attribute error: Need native word sized stores/loads for atomicity.
  435 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
      |                                             ^
include/linux/compiler_types.h:416:25: note: in definition of macro '__compiletime_assert'
  416 |                         prefix ## suffix();                             \
      |                         ^~~~~~
include/linux/compiler_types.h:435:9: note: in expansion of macro '_compiletime_assert'
  435 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
      |         ^~~~~~~~~~~~~~~~~~~
include/linux/compiler_types.h:438:9: note: in expansion of macro 'compiletime_assert'
  438 |         compiletime_assert(__native_word(t),                            \
      |         ^~~~~~~~~~~~~~~~~~
include/asm-generic/barrier.h:206:9: note: in expansion of macro 'compiletime_assert_atomic_type'
  206 |         compiletime_assert_atomic_type(*p);                             \
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/fs.h:911:16: note: in expansion of macro 'smp_load_acquire'
  911 |         return smp_load_acquire(&inode->i_size);
      |                ^~~~~~~~~~~~~~~~

Caused by commit

  4bbd51d0f0ad ("fs: make the i_size_read/write helpers be smp_load_acquire/store_release()")

I have used the vfs-brauner tree from next-20240122 for today.

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

On Tue, 23 Jan 2024 12:52:27 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> After merging the vfs-brauner tree, today's linux-next build (powerpc
> allnoconfig) failed like this:
> 
> In file included from <command-line>:
> In function 'i_size_read',
>     inlined from '__iomap_dio_rw' at fs/iomap/direct-io.c:570:16:
> include/linux/compiler_types.h:435:45: error: call to '__compiletime_assert_229' declared with attribute error: Need native word sized stores/loads for atomicity.
>   435 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
>       |                                             ^
> include/linux/compiler_types.h:416:25: note: in definition of macro '__compiletime_assert'
>   416 |                         prefix ## suffix();                             \
>       |                         ^~~~~~
> include/linux/compiler_types.h:435:9: note: in expansion of macro '_compiletime_assert'
>   435 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
>       |         ^~~~~~~~~~~~~~~~~~~
> include/linux/compiler_types.h:438:9: note: in expansion of macro 'compiletime_assert'
>   438 |         compiletime_assert(__native_word(t),                            \
>       |         ^~~~~~~~~~~~~~~~~~
> include/asm-generic/barrier.h:206:9: note: in expansion of macro 'compiletime_assert_atomic_type'
>   206 |         compiletime_assert_atomic_type(*p);                             \
>       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> include/linux/fs.h:911:16: note: in expansion of macro 'smp_load_acquire'
>   911 |         return smp_load_acquire(&inode->i_size);
>       |                ^~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   4bbd51d0f0ad ("fs: make the i_size_read/write helpers be smp_load_acquire/store_release()")
> 
> I have used the vfs-brauner tree from next-20240122 for today.

Pending a better resolution, today I have reverted that commit and the
following one.

-- 
Cheers,
Stephen Rothwell

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

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

[Christian Brauner]

On Wed, Jan 24, 2024 at 12:20:40PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Tue, 23 Jan 2024 12:52:27 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > After merging the vfs-brauner tree, today's linux-next build (powerpc
> > allnoconfig) failed like this:
> > 
> > In file included from <command-line>:
> > In function 'i_size_read',
> >     inlined from '__iomap_dio_rw' at fs/iomap/direct-io.c:570:16:
> > include/linux/compiler_types.h:435:45: error: call to '__compiletime_assert_229' declared with attribute error: Need native word sized stores/loads for atomicity.
> >   435 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
> >       |                                             ^
> > include/linux/compiler_types.h:416:25: note: in definition of macro '__compiletime_assert'
> >   416 |                         prefix ## suffix();                             \
> >       |                         ^~~~~~
> > include/linux/compiler_types.h:435:9: note: in expansion of macro '_compiletime_assert'
> >   435 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
> >       |         ^~~~~~~~~~~~~~~~~~~
> > include/linux/compiler_types.h:438:9: note: in expansion of macro 'compiletime_assert'
> >   438 |         compiletime_assert(__native_word(t),                            \
> >       |         ^~~~~~~~~~~~~~~~~~
> > include/asm-generic/barrier.h:206:9: note: in expansion of macro 'compiletime_assert_atomic_type'
> >   206 |         compiletime_assert_atomic_type(*p);                             \
> >       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > include/linux/fs.h:911:16: note: in expansion of macro 'smp_load_acquire'
> >   911 |         return smp_load_acquire(&inode->i_size);
> >       |                ^~~~~~~~~~~~~~~~
> > 
> > Caused by commit
> > 
> >   4bbd51d0f0ad ("fs: make the i_size_read/write helpers be smp_load_acquire/store_release()")
> > 
> > I have used the vfs-brauner tree from next-20240122 for today.
> 
> Pending a better resolution, today I have reverted that commit and the
> following one.

I had dropped both from vfs.misc yesterday night. Maybe it didn't make
it in time.

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

[Stephen Rothwell]

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

Hi Christian,

On Wed, 24 Jan 2024 12:13:02 +0100 Christian Brauner <brauner@kernel.org> wrote:
>
> I had dropped both from vfs.misc yesterday night. Maybe it didn't make
> it in time.

It still has not ... I only fetch your vfs.all branch.  Did you remerge
and push it out?

-- 
Cheers,
Stephen Rothwell

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

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

[Christian Brauner]

On Wed, Jan 24, 2024 at 10:35:37PM +1100, Stephen Rothwell wrote:
> Hi Christian,
> 
> On Wed, 24 Jan 2024 12:13:02 +0100 Christian Brauner <brauner@kernel.org> wrote:
> >
> > I had dropped both from vfs.misc yesterday night. Maybe it didn't make
> > it in time.
> 
> It still has not ... I only fetch your vfs.all branch.  Did you remerge
> and push it out?

So vfs.all should be at:

commit 8577a331532bb1d75f3536461739a0a8e15b219c
Merge: 0c5c260545bd 06b8db3a7dde
Author:     Christian Brauner <brauner@kernel.org>
AuthorDate: Wed Jan 24 18:33:30 2024 +0100
Commit:     Christian Brauner <brauner@kernel.org>
CommitDate: Wed Jan 24 18:33:30 2024 +0100

    Merge branch 'vfs.fs' into vfs.all

    Signed-off-by: Christian Brauner <brauner@kernel.org>

And that should've contain a merge of vfs.misc with all problematic
patches dropped. Please yell if you still see an issue tomorrow!

linux-next: build failure after merge of the vfs-brauner tree

[Stephen Rothwell]

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

Hi all,

After merging the vfs-brauner tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

fs/netfs/buffered_write.c: In function 'netfs_kill_pages':
fs/netfs/buffered_write.c:569:17: error: implicit declaration of function 'generic_error_remove_page'; did you mean 'generic_error_remove_folio'? [-Werror=implicit-function-declaration]
  569 |                 generic_error_remove_page(mapping, folio_page(folio, 0));
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~
      |                 generic_error_remove_folio

Caused by commit

  dec5b4af52dc ("netfs: Provide a writepages implementation")

interacting with commit

  af7628d6ec19 ("fs: convert error_remove_page to error_remove_folio")

from the mm-stable tree.

I have applied the following merge resolution patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 21 Dec 2023 11:08:57 +1100
Subject: [PATCH] fixup for "netfs: Provide a writepages implementation"

interacting with

  af7628d6ec19 ("fs: convert error_remove_page to error_remove_folio")

from the mm-stable tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/netfs/buffered_write.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/netfs/buffered_write.c b/fs/netfs/buffered_write.c
index a739805dd394..d7ce424b9188 100644
--- a/fs/netfs/buffered_write.c
+++ b/fs/netfs/buffered_write.c
@@ -566,7 +566,7 @@ static void netfs_kill_pages(struct address_space *mapping,
 			folio_end_fscache(folio);
 		folio_end_writeback(folio);
 		folio_lock(folio);
-		generic_error_remove_page(mapping, folio_page(folio, 0));
+		generic_error_remove_folio(mapping, folio);
 		folio_unlock(folio);
 		folio_put(folio);
 
-- 
2.43.0

-- 
Cheers,
Stephen Rothwell

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

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

[Matthew Wilcox]

On Thu, Dec 21, 2023 at 11:18:47AM +1100, Stephen Rothwell wrote:
> I have applied the following merge resolution patch:

The merge resolution is correct ...

> +++ b/fs/netfs/buffered_write.c
> @@ -566,7 +566,7 @@ static void netfs_kill_pages(struct address_space *mapping,
>  			folio_end_fscache(folio);
>  		folio_end_writeback(folio);
>  		folio_lock(folio);
> -		generic_error_remove_page(mapping, folio_page(folio, 0));

but what Dave wrote here is _not_.

Call folio_page() when you need to go back from folio to page for
something that is intrinsically page based, like kmap().  This isn't
that case.  This is an interface that hadn't been converted yet, and
specifying &folio->page is the correct way to handle this because it's
an indication that there is work here to do before we can call the folio
conversion complete.

Please be more careful.

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

[Stephen Rothwell]

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

Hi all,

On Thu, 21 Dec 2023 11:18:47 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the vfs-brauner tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> fs/netfs/buffered_write.c: In function 'netfs_kill_pages':
> fs/netfs/buffered_write.c:569:17: error: implicit declaration of function 'generic_error_remove_page'; did you mean 'generic_error_remove_folio'? [-Werror=implicit-function-declaration]
>   569 |                 generic_error_remove_page(mapping, folio_page(folio, 0));
>       |                 ^~~~~~~~~~~~~~~~~~~~~~~~~
>       |                 generic_error_remove_folio
> 
> Caused by commit
> 
>   dec5b4af52dc ("netfs: Provide a writepages implementation")
> 
> interacting with commit
> 
>   af7628d6ec19 ("fs: convert error_remove_page to error_remove_folio")
> 
> from the mm-stable tree.
> 
> I have applied the following merge resolution patch:

The resolution is now:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 21 Dec 2023 11:08:57 +1100
Subject: [PATCH] fixup for "netfs: Provide a writepages implementation"

interacting with

  af7628d6ec19 ("fs: convert error_remove_page to error_remove_folio")

from the mm-stable tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/netfs/buffered_write.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/netfs/buffered_write.c b/fs/netfs/buffered_write.c
index a739805dd394..d7ce424b9188 100644
--- a/fs/netfs/buffered_write.c
+++ b/fs/netfs/buffered_write.c
@@ -566,7 +566,7 @@ static void netfs_kill_pages(struct address_space *mapping,
 			folio_end_fscache(folio);
 		folio_end_writeback(folio);
 		folio_lock(folio);
-		generic_error_remove_page(mapping, &folio->page);
+		generic_error_remove_folio(mapping, folio);
 		folio_unlock(folio);
 		folio_put(folio);
 
-- 
2.43.0

-- 
Cheers,
Stephen Rothwell

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

linux-next: build failure after merge of the vfs-brauner tree

[Stephen Rothwell]

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

Hi all,

After merging the vfs-brauner tree, today's linux-next build (x86_64
allmodconfig) failed like this:

fs/bcachefs/fs-ioctl.c: In function 'bch2_ioc_goingdown':
fs/bcachefs/fs-ioctl.c:294:23: error: implicit declaration of function 'freeze_bdev' [-Werror=implicit-function-declaration]
  294 |                 ret = freeze_bdev(c->vfs_sb->s_bdev);
      |                       ^~~~~~~~~~~
fs/bcachefs/fs-ioctl.c:301:17: error: implicit declaration of function 'thaw_bdev' [-Werror=implicit-function-declaration]
  301 |                 thaw_bdev(c->vfs_sb->s_bdev);
      |                 ^~~~~~~~~

Caused by commit

  46bb2e011760 ("bdev: rename freeze and thaw helpers")

interacting with commit

  4495cbed568b ("bcachefs: Improve FS_IOC_GOINGDOWN ioctl")

I have applied the following merge resolution patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 31 Oct 2023 12:00:27 +1100
Subject: [PATCH] fixup for "bdev: rename freeze and thaw helpers"

interacting with "bcachefs: Improve FS_IOC_GOINGDOWN ioctl".

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/bcachefs/fs-ioctl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/bcachefs/fs-ioctl.c b/fs/bcachefs/fs-ioctl.c
index 6040bd3f0778..d715a2b35189 100644
--- a/fs/bcachefs/fs-ioctl.c
+++ b/fs/bcachefs/fs-ioctl.c
@@ -291,14 +291,14 @@ static int bch2_ioc_goingdown(struct bch_fs *c, u32 __user *arg)
 
 	switch (flags) {
 	case FSOP_GOING_FLAGS_DEFAULT:
-		ret = freeze_bdev(c->vfs_sb->s_bdev);
+		ret = bdev_freeze(c->vfs_sb->s_bdev);
 		if (ret)
 			goto err;
 
 		bch2_journal_flush(&c->journal);
 		c->vfs_sb->s_flags |= SB_RDONLY;
 		bch2_fs_emergency_read_only(c);
-		thaw_bdev(c->vfs_sb->s_bdev);
+		bdev_thaw(c->vfs_sb->s_bdev);
 		break;
 
 	case FSOP_GOING_FLAGS_LOGFLUSH:
-- 
2.40.1

-- 
Cheers,
Stephen Rothwell

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

linux-next: build failure after merge of the vfs-brauner tree

[Stephen Rothwell]

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

Hi all,

After merging the vfs-brauner tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: modpost: "bdev_mark_dead" [drivers/block/floppy.ko] undefined!

Caused by commit

  3b97609801fa ("block: move bdev_mark_dead out of disk_check_media_change")

I have used the vfs-brauner tree from next-20231018 for today.

-- 
Cheers,
Stephen Rothwell

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

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

[Christian Brauner]

On Thu, Oct 19, 2023 at 10:54:05AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the vfs-brauner tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: modpost: "bdev_mark_dead" [drivers/block/floppy.ko] undefined!
> 
> Caused by commit
> 
>   3b97609801fa ("block: move bdev_mark_dead out of disk_check_media_change")
> 
> I have used the vfs-brauner tree from next-20231018 for today.

Thanks! Fixed now.

linux-next: build failure after merge of the vfs-brauner tree

[Stephen Rothwell]

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

Hi all,

After merging the vfs-brauner tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

ERROR: modpost: "fget_files_rcu" [arch/powerpc/platforms/cell/spufs/spufs.ko] undefined!

Caused by commit

  af66b51563ad ("file: convert to SLAB_TYPESAFE_BY_RCU")

I applied the following fix up patch.

From dab8e3bea1812a352c6e21bf0d0b49d833595d19 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 3 Oct 2023 09:26:33 +1100
Subject: [PATCH] fix up for "file: convert to SLAB_TYPESAFE_BY_RCU"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/file.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/file.c b/fs/file.c
index e37611221161..f804d7e50958 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -972,6 +972,7 @@ struct file *fget_files_rcu(struct files_struct *files, unsigned int fd)
 {
 	return __fget_files_rcu(files, fd, 0);
 }
+EXPORT_SYMBOL_GPL(fget_files_rcu);
 
 static struct file *__fget_files(struct files_struct *files, unsigned int fd,
 				 fmode_t mask)
-- 
2.40.1

-- 
Cheers,
Stephen Rothwell

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

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

[Christian Brauner]

On Tue, Oct 03, 2023 at 09:30:05AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the vfs-brauner tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> ERROR: modpost: "fget_files_rcu" [arch/powerpc/platforms/cell/spufs/spufs.ko] undefined!
> 
> Caused by commit
> 
>   af66b51563ad ("file: convert to SLAB_TYPESAFE_BY_RCU")
> 
> I applied the following fix up patch.

Thank you. On vacation this week (I saw Jan already informed you.) but I
fixed this up by removing fget_files_rcu() exposure in a header
completely.

linux-next: build failure after merge of the vfs-brauner tree

[Stephen Rothwell]

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

Hi all,

After merging the vfs-brauner tree, today's linux-next build (x86_64
allmodconfig) failed like this:

fs/bcachefs/super-io.c: In function 'bch2_free_super':
fs/bcachefs/super-io.c:166:17: error: implicit declaration of function 'blkdev_put'; did you mean 'bdi_put'? [-Werror=implicit-function-declaration]
  166 |                 blkdev_put(sb->bdev, sb->holder);
      |                 ^~~~~~~~~~
      |                 bdi_put
fs/bcachefs/super-io.c: In function 'bch2_read_super':
fs/bcachefs/super-io.c:687:20: error: implicit declaration of function 'blkdev_get_by_path'; did you mean 'bdev_open_by_path'? [-Werror=implicit-function-declaration]
  687 |         sb->bdev = blkdev_get_by_path(path, sb->mode, sb->holder, &bch2_sb_handle_bdev_ops);
      |                    ^~~~~~~~~~~~~~~~~~
      |                    bdev_open_by_path
fs/bcachefs/super-io.c:687:18: error: assignment to 'struct block_device *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
  687 |         sb->bdev = blkdev_get_by_path(path, sb->mode, sb->holder, &bch2_sb_handle_bdev_ops);
      |                  ^
fs/bcachefs/super-io.c:693:26: error: assignment to 'struct block_device *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
  693 |                 sb->bdev = blkdev_get_by_path(path, sb->mode, sb->holder, &bch2_sb_handle_bdev_ops);
      |                          ^
cc1: all warnings being treated as errors

Caused by commit

  953863a5a2ff ("block: Remove blkdev_get_by_*() functions")

interacting with commit(s) from the bcachefs tree.

I would have reverted that commit for today, except I used the old
vfs-brauner tree due to another build failure.  Can we just delay this
one commit until after bcachefs has been converted (and any other
references that may be added are fixed)?

-- 
Cheers,
Stephen Rothwell

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

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

[Jan Kara]

Hi!

On Thu 28-09-23 10:54:43, Stephen Rothwell wrote:
> After merging the vfs-brauner tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> fs/bcachefs/super-io.c: In function 'bch2_free_super':
> fs/bcachefs/super-io.c:166:17: error: implicit declaration of function 'blkdev_put'; did you mean 'bdi_put'? [-Werror=implicit-function-declaration]
>   166 |                 blkdev_put(sb->bdev, sb->holder);
>       |                 ^~~~~~~~~~
>       |                 bdi_put
> fs/bcachefs/super-io.c: In function 'bch2_read_super':
> fs/bcachefs/super-io.c:687:20: error: implicit declaration of function 'blkdev_get_by_path'; did you mean 'bdev_open_by_path'? [-Werror=implicit-function-declaration]
>   687 |         sb->bdev = blkdev_get_by_path(path, sb->mode, sb->holder, &bch2_sb_handle_bdev_ops);
>       |                    ^~~~~~~~~~~~~~~~~~
>       |                    bdev_open_by_path
> fs/bcachefs/super-io.c:687:18: error: assignment to 'struct block_device *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
>   687 |         sb->bdev = blkdev_get_by_path(path, sb->mode, sb->holder, &bch2_sb_handle_bdev_ops);
>       |                  ^
> fs/bcachefs/super-io.c:693:26: error: assignment to 'struct block_device *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
>   693 |                 sb->bdev = blkdev_get_by_path(path, sb->mode, sb->holder, &bch2_sb_handle_bdev_ops);
>       |                          ^
> cc1: all warnings being treated as errors
> 
> Caused by commit
> 
>   953863a5a2ff ("block: Remove blkdev_get_by_*() functions")
> 
> interacting with commit(s) from the bcachefs tree.
> 
> I would have reverted that commit for today, except I used the old
> vfs-brauner tree due to another build failure.  Can we just delay this
> one commit until after bcachefs has been converted (and any other
> references that may be added are fixed)?

Yeah, I guess removing the final commit is the easiest solution at this
point. It complicates a bit the series to disallow writing to mounted block
devices which bases on this - either I have to pospone that to the next
cycle after we convert bcachefs or I have to find a way for the old
blkdev_get_by_path() API and the new functionality to coexist. I'll think
about that.

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

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

[Jan Kara]

On Mon 02-10-23 13:21:42, Jan Kara wrote:
> Hi!
> 
> On Thu 28-09-23 10:54:43, Stephen Rothwell wrote:
> > After merging the vfs-brauner tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > fs/bcachefs/super-io.c: In function 'bch2_free_super':
> > fs/bcachefs/super-io.c:166:17: error: implicit declaration of function 'blkdev_put'; did you mean 'bdi_put'? [-Werror=implicit-function-declaration]
> >   166 |                 blkdev_put(sb->bdev, sb->holder);
> >       |                 ^~~~~~~~~~
> >       |                 bdi_put
> > fs/bcachefs/super-io.c: In function 'bch2_read_super':
> > fs/bcachefs/super-io.c:687:20: error: implicit declaration of function 'blkdev_get_by_path'; did you mean 'bdev_open_by_path'? [-Werror=implicit-function-declaration]
> >   687 |         sb->bdev = blkdev_get_by_path(path, sb->mode, sb->holder, &bch2_sb_handle_bdev_ops);
> >       |                    ^~~~~~~~~~~~~~~~~~
> >       |                    bdev_open_by_path
> > fs/bcachefs/super-io.c:687:18: error: assignment to 'struct block_device *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
> >   687 |         sb->bdev = blkdev_get_by_path(path, sb->mode, sb->holder, &bch2_sb_handle_bdev_ops);
> >       |                  ^
> > fs/bcachefs/super-io.c:693:26: error: assignment to 'struct block_device *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
> >   693 |                 sb->bdev = blkdev_get_by_path(path, sb->mode, sb->holder, &bch2_sb_handle_bdev_ops);
> >       |                          ^
> > cc1: all warnings being treated as errors
> > 
> > Caused by commit
> > 
> >   953863a5a2ff ("block: Remove blkdev_get_by_*() functions")
> > 
> > interacting with commit(s) from the bcachefs tree.
> > 
> > I would have reverted that commit for today, except I used the old
> > vfs-brauner tree due to another build failure.  Can we just delay this
> > one commit until after bcachefs has been converted (and any other
> > references that may be added are fixed)?
> 
> Yeah, I guess removing the final commit is the easiest solution at this
> point. It complicates a bit the series to disallow writing to mounted block
> devices which bases on this - either I have to pospone that to the next
> cycle after we convert bcachefs or I have to find a way for the old
> blkdev_get_by_path() API and the new functionality to coexist. I'll think
> about that.

Oh, and one more note - Christian is on vacation this week so Stephen please
just revert the commit in the linux-next until he returns and updates his
tree. Thanks!

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

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

[Stephen Rothwell]

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

Hi Jan,

On Mon, 2 Oct 2023 13:26:48 +0200 Jan Kara <jack@suse.cz> wrote:
>
> Oh, and one more note - Christian is on vacation this week so Stephen please
> just revert the commit in the linux-next until he returns and updates his
> tree. Thanks!

Thanks for letting me know, I will do so.

-- 
Cheers,
Stephen Rothwell

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

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

[Kent Overstreet]

On Mon, Oct 02, 2023 at 01:21:42PM +0200, Jan Kara wrote:
> Hi!
> 
> On Thu 28-09-23 10:54:43, Stephen Rothwell wrote:
> > After merging the vfs-brauner tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > fs/bcachefs/super-io.c: In function 'bch2_free_super':
> > fs/bcachefs/super-io.c:166:17: error: implicit declaration of function 'blkdev_put'; did you mean 'bdi_put'? [-Werror=implicit-function-declaration]
> >   166 |                 blkdev_put(sb->bdev, sb->holder);
> >       |                 ^~~~~~~~~~
> >       |                 bdi_put
> > fs/bcachefs/super-io.c: In function 'bch2_read_super':
> > fs/bcachefs/super-io.c:687:20: error: implicit declaration of function 'blkdev_get_by_path'; did you mean 'bdev_open_by_path'? [-Werror=implicit-function-declaration]
> >   687 |         sb->bdev = blkdev_get_by_path(path, sb->mode, sb->holder, &bch2_sb_handle_bdev_ops);
> >       |                    ^~~~~~~~~~~~~~~~~~
> >       |                    bdev_open_by_path
> > fs/bcachefs/super-io.c:687:18: error: assignment to 'struct block_device *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
> >   687 |         sb->bdev = blkdev_get_by_path(path, sb->mode, sb->holder, &bch2_sb_handle_bdev_ops);
> >       |                  ^
> > fs/bcachefs/super-io.c:693:26: error: assignment to 'struct block_device *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
> >   693 |                 sb->bdev = blkdev_get_by_path(path, sb->mode, sb->holder, &bch2_sb_handle_bdev_ops);
> >       |                          ^
> > cc1: all warnings being treated as errors
> > 
> > Caused by commit
> > 
> >   953863a5a2ff ("block: Remove blkdev_get_by_*() functions")
> > 
> > interacting with commit(s) from the bcachefs tree.
> > 
> > I would have reverted that commit for today, except I used the old
> > vfs-brauner tree due to another build failure.  Can we just delay this
> > one commit until after bcachefs has been converted (and any other
> > references that may be added are fixed)?
> 
> Yeah, I guess removing the final commit is the easiest solution at this
> point. It complicates a bit the series to disallow writing to mounted block
> devices which bases on this - either I have to pospone that to the next
> cycle after we convert bcachefs or I have to find a way for the old
> blkdev_get_by_path() API and the new functionality to coexist. I'll think
> about that.

Jan, Christain - what do you need from me for the conversion?

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

[Jan Kara]

On Tue 03-10-23 09:27:11, Kent Overstreet wrote:
> On Mon, Oct 02, 2023 at 01:21:42PM +0200, Jan Kara wrote:
> > Hi!
> > 
> > On Thu 28-09-23 10:54:43, Stephen Rothwell wrote:
> > > After merging the vfs-brauner tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > > 
> > > fs/bcachefs/super-io.c: In function 'bch2_free_super':
> > > fs/bcachefs/super-io.c:166:17: error: implicit declaration of function 'blkdev_put'; did you mean 'bdi_put'? [-Werror=implicit-function-declaration]
> > >   166 |                 blkdev_put(sb->bdev, sb->holder);
> > >       |                 ^~~~~~~~~~
> > >       |                 bdi_put
> > > fs/bcachefs/super-io.c: In function 'bch2_read_super':
> > > fs/bcachefs/super-io.c:687:20: error: implicit declaration of function 'blkdev_get_by_path'; did you mean 'bdev_open_by_path'? [-Werror=implicit-function-declaration]
> > >   687 |         sb->bdev = blkdev_get_by_path(path, sb->mode, sb->holder, &bch2_sb_handle_bdev_ops);
> > >       |                    ^~~~~~~~~~~~~~~~~~
> > >       |                    bdev_open_by_path
> > > fs/bcachefs/super-io.c:687:18: error: assignment to 'struct block_device *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
> > >   687 |         sb->bdev = blkdev_get_by_path(path, sb->mode, sb->holder, &bch2_sb_handle_bdev_ops);
> > >       |                  ^
> > > fs/bcachefs/super-io.c:693:26: error: assignment to 'struct block_device *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
> > >   693 |                 sb->bdev = blkdev_get_by_path(path, sb->mode, sb->holder, &bch2_sb_handle_bdev_ops);
> > >       |                          ^
> > > cc1: all warnings being treated as errors
> > > 
> > > Caused by commit
> > > 
> > >   953863a5a2ff ("block: Remove blkdev_get_by_*() functions")
> > > 
> > > interacting with commit(s) from the bcachefs tree.
> > > 
> > > I would have reverted that commit for today, except I used the old
> > > vfs-brauner tree due to another build failure.  Can we just delay this
> > > one commit until after bcachefs has been converted (and any other
> > > references that may be added are fixed)?
> > 
> > Yeah, I guess removing the final commit is the easiest solution at this
> > point. It complicates a bit the series to disallow writing to mounted block
> > devices which bases on this - either I have to pospone that to the next
> > cycle after we convert bcachefs or I have to find a way for the old
> > blkdev_get_by_path() API and the new functionality to coexist. I'll think
> > about that.
> 
> Jan, Christain - what do you need from me for the conversion?

Well, the conversion is rather easy. You just need to call the new
bdev_open_by_path() function instead of the old blkdev_get_by_path(). It
returns struct bdev_handle (instead of plain struct bdev) and you
eventually need to pass this struct to bdev_release() (instead of calling
blkdev_put()).

But the merge at this point would be somewhat difficult because you'd need
to pull Christian's branch into your tree to get bdev_open_by_path() in the
first place. And that branch already depends on some changes in the btrfs
tree. So to save ourselves some headaches during the merge window, I think
not removing the old functions until bcachefs gets merged is the easiest
solution.

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

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

[Christian Brauner]

> But the merge at this point would be somewhat difficult because you'd need
> to pull Christian's branch into your tree to get bdev_open_by_path() in the
> first place. And that branch already depends on some changes in the btrfs
> tree. So to save ourselves some headaches during the merge window, I think
> not removing the old functions until bcachefs gets merged is the easiest
> solution.

I dropped

commit 8ea3ec0740bdea9105eb416f07eef5d031b9385a
Author:     Jan Kara <jack@suse.cz>
AuthorDate: Wed Sep 27 11:34:35 2023 +0200
Commit:     Christian Brauner <brauner@kernel.org>
CommitDate: Thu Sep 28 16:51:49 2023 +0200

    block: Remove blkdev_get_by_*() functions

    blkdev_get_by_*() and blkdev_put() functions are now unused. Remove
    them.

    Acked-by: Christoph Hellwig <hch@lst.de>
    Reviewed-by: Christian Brauner <brauner@kernel.org>
    Signed-off-by: Jan Kara <jack@suse.cz>
    Link: https://lore.kernel.org/r/20230927093442.25915-29-jack@suse.cz
    Signed-off-by: Christian Brauner <brauner@kernel.org>

for now. You can find an archive of that branch including that commit
under the tag vfs.super.2023-10-09

Thanks!

linux-next: build failure after merge of the vfs-brauner tree

[Stephen Rothwell]

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

Hi all,

After merging the vfs-brauner tree, today's linux-next build (x86_64
allmodconfig) failed like this:

mm/shmem.c: In function 'shmem_enable_quotas':
mm/shmem.c:284:23: error: implicit declaration of function 'dquot_load_quota_sb'; did you mean 'dquot_load_quota_inode'? [-Werror=implicit-function-declaration]
  284 |                 err = dquot_load_quota_sb(sb, type, QFMT_SHMEM,
      |                       ^~~~~~~~~~~~~~~~~~~
      |                       dquot_load_quota_inode

Caused by commit

  220a17f613eb ("shmem: quota support")

interacting with commit

  9543f84c067d ("quota: mark dquot_load_quota_sb static")

from the ext3 tree.

I have reverted the ext3 tree patch for today.

-- 
Cheers,
Stephen Rothwell

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

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

[Jan Kara]

Hi!

On Thu 03-08-23 10:03:03, Stephen Rothwell wrote:
> After merging the vfs-brauner tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> mm/shmem.c: In function 'shmem_enable_quotas':
> mm/shmem.c:284:23: error: implicit declaration of function 'dquot_load_quota_sb'; did you mean 'dquot_load_quota_inode'? [-Werror=implicit-function-declaration]
>   284 |                 err = dquot_load_quota_sb(sb, type, QFMT_SHMEM,
>       |                       ^~~~~~~~~~~~~~~~~~~
>       |                       dquot_load_quota_inode
> 
> Caused by commit
> 
>   220a17f613eb ("shmem: quota support")
> 
> interacting with commit
> 
>   9543f84c067d ("quota: mark dquot_load_quota_sb static")
> 
> from the ext3 tree.
> 
> I have reverted the ext3 tree patch for today.

Thanks for letting me know. I've reverted the commit 9543f84c067d from my
tree.

								Honza

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