linux-next: build failure after merge of the f2fs tree

linux-next: build failure after merge of the f2fs tree

[Stephen Rothwell]

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

Hi all,

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

fs/f2fs/data.c: In function 'f2fs_write_failed':
fs/f2fs/data.c:3144:27: error: 'mapping' undeclared (first use in this function)
 3144 |   filemap_invalidate_lock(mapping);
      |                           ^~~~~~~

Caused by commit

  ceddc02b7613 ("f2fs: make f2fs_write_failed() take struct inode")

interacting with commit

  edc6d01bad73 ("f2fs: Convert to using invalidate_lock")

from the ext3 tree.

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 23 Jul 2021 10:47:23 +1000
Subject: [PATCH] fxup for "f2fs: Convert to using invalidate_lock"

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

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 2e6fee68f891..0fb7b69976f1 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3141,12 +3141,12 @@ static void f2fs_write_failed(struct inode *inode, loff_t to)
 	/* In the fs-verity case, f2fs_end_enable_verity() does the truncate */
 	if (to > i_size && !f2fs_verity_in_progress(inode)) {
 		down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
-		filemap_invalidate_lock(mapping);
+		filemap_invalidate_lock(inode->i_mapping);
 
 		truncate_pagecache(inode, i_size);
 		f2fs_truncate_blocks(inode, i_size, true);
 
-		filemap_invalidate_unlock(mapping);
+		filemap_invalidate_unlock(inode->i_mapping);
 		up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
 	}
 }
-- 
2.30.2

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

On Fri, 23 Jul 2021 11:11:19 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the f2fs tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> fs/f2fs/data.c: In function 'f2fs_write_failed':
> fs/f2fs/data.c:3144:27: error: 'mapping' undeclared (first use in this function)
>  3144 |   filemap_invalidate_lock(mapping);
>       |                           ^~~~~~~
> 
> Caused by commit
> 
>   ceddc02b7613 ("f2fs: make f2fs_write_failed() take struct inode")
> 
> interacting with commit
> 
>   edc6d01bad73 ("f2fs: Convert to using invalidate_lock")
> 
> from the ext3 tree.
> 
> I have applied the following merge fix patch.
> 

This fix up patch is now:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 27 Aug 2021 10:10:01 +1000
Subject: [PATCH] fxup for "f2fs: Convert to using invalidate_lock"

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

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index b03ec36cce1c..0facb5eb0acb 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3260,12 +3260,12 @@ static void f2fs_write_failed(struct inode *inode, loff_t to)
 	/* In the fs-verity case, f2fs_end_enable_verity() does the truncate */
 	if (to > i_size && !f2fs_verity_in_progress(inode)) {
 		down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
-		filemap_invalidate_lock(mapping);
+		filemap_invalidate_lock(inode->i_mapping);
 
 		truncate_pagecache(inode, i_size);
 		f2fs_truncate_blocks(inode, i_size, true);
 
-		filemap_invalidate_unlock(mapping);
+		filemap_invalidate_unlock(inode->i_mapping);
 		up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
 	}
 }
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 884a165e70eb..9c8ef33bd8d3 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -1112,7 +1112,7 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len)
 			blk_end = (loff_t)pg_end << PAGE_SHIFT;
 
 			down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
-			filemap_invalidate_lock(mapping);
+			filemap_invalidate_lock(inode->i_mapping);
 
 			truncate_pagecache_range(inode, blk_start, blk_end - 1);
 
@@ -1120,7 +1120,7 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len)
 			ret = f2fs_truncate_hole(inode, pg_start, pg_end);
 			f2fs_unlock_op(sbi);
 
-			filemap_invalidate_unlock(mapping);
+			filemap_invalidate_unlock(inode->i_mapping);
 			up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
 		}
 	}
-- 
2.32.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 f2fs tree

[Stephen Rothwell]

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

Hi all,

On Wed, 23 Jun 2021 10:49:22 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
> 
> After merging the f2fs tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> fs/f2fs/data.c: In function 'f2fs_migrate_blocks':
> fs/f2fs/data.c:3853:27: error: 'struct f2fs_inode_info' has no member named 'i_mmap_sem'
>  3853 |  down_write(&F2FS_I(inode)->i_mmap_sem);
>       |                           ^~
> fs/f2fs/data.c:3895:25: error: 'struct f2fs_inode_info' has no member named 'i_mmap_sem'
>  3895 |  up_write(&F2FS_I(inode)->i_mmap_sem);
>       |                         ^~
> 
> Caused by commit
> 
>   7cc52cc33717 ("f2fs: swap: support migrating swapfile in aligned write mode")
> 
> interacting with commit
> 
>   c3762b9d26e1 ("f2fs: Convert to using invalidate_lock")
> 
> from the ext3 tree.
> 
> I have applied the following merge fix patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 23 Jun 2021 10:40:54 +1000
> Subject: [PATCH] fix up for "f2fs: Convert to using invalidate_lock"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  fs/f2fs/data.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index 2fc1b71c640b..acf2dea65abc 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -3850,7 +3850,7 @@ static int f2fs_migrate_blocks(struct inode *inode, block_t start_blk,
>  	int ret = 0;
>  
>  	down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
> -	down_write(&F2FS_I(inode)->i_mmap_sem);
> +	filemap_invalidate_lock(inode->i_mapping);
>  
>  	set_inode_flag(inode, FI_ALIGNED_WRITE);
>  
> @@ -3892,7 +3892,7 @@ static int f2fs_migrate_blocks(struct inode *inode, block_t start_blk,
>  	clear_inode_flag(inode, FI_DO_DEFRAG);
>  	clear_inode_flag(inode, FI_ALIGNED_WRITE);
>  
> -	up_write(&F2FS_I(inode)->i_mmap_sem);
> +	filemap_invalidate_unlock(inode->i_mapping);
>  	up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
>  
>  	return ret;

This is now a conflict between the ext3 tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: build failure after merge of the f2fs tree

[Stephen Rothwell]

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

Hi all,

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

fs/f2fs/data.c: In function 'f2fs_migrate_blocks':
fs/f2fs/data.c:3853:27: error: 'struct f2fs_inode_info' has no member named 'i_mmap_sem'
 3853 |  down_write(&F2FS_I(inode)->i_mmap_sem);
      |                           ^~
fs/f2fs/data.c:3895:25: error: 'struct f2fs_inode_info' has no member named 'i_mmap_sem'
 3895 |  up_write(&F2FS_I(inode)->i_mmap_sem);
      |                         ^~

Caused by commit

  7cc52cc33717 ("f2fs: swap: support migrating swapfile in aligned write mode")

interacting with commit

  c3762b9d26e1 ("f2fs: Convert to using invalidate_lock")

from the ext3 tree.

I have applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 23 Jun 2021 10:40:54 +1000
Subject: [PATCH] fix up for "f2fs: Convert to using invalidate_lock"

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

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 2fc1b71c640b..acf2dea65abc 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3850,7 +3850,7 @@ static int f2fs_migrate_blocks(struct inode *inode, block_t start_blk,
 	int ret = 0;
 
 	down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
-	down_write(&F2FS_I(inode)->i_mmap_sem);
+	filemap_invalidate_lock(inode->i_mapping);
 
 	set_inode_flag(inode, FI_ALIGNED_WRITE);
 
@@ -3892,7 +3892,7 @@ static int f2fs_migrate_blocks(struct inode *inode, block_t start_blk,
 	clear_inode_flag(inode, FI_DO_DEFRAG);
 	clear_inode_flag(inode, FI_ALIGNED_WRITE);
 
-	up_write(&F2FS_I(inode)->i_mmap_sem);
+	filemap_invalidate_unlock(inode->i_mapping);
 	up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
 
 	return ret;
-- 
2.30.2

-- 
Cheers,
Stephen Rothwell

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

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

[Jaegeuk Kim]

On 11/03, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the f2fs tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from <command-line>:32:
> ./usr/include/linux/f2fs.h:92:2: error: unknown type name 'u8'
>    92 |  u8 algorithm;
>       |  ^~
> ./usr/include/linux/f2fs.h:93:2: error: unknown type name 'u8'
>    93 |  u8 log_cluster_size;
>       |  ^~
> 
> Caused by commit
> 
>   63d18d4913e5 ("f2fs: add F2FS_IOC_GET_COMPRESS_OPTION ioctl")
> 
> You should only use the "__" versions of types in uapi headers.

Thanks, I fixed it in the git directly.

> 
> I have used the version of the f2fs tree from next-20201102 for today.
> 
> -- 
> Cheers,
> Stephen Rothwell

linux-next: build failure after merge of the f2fs tree

[Stephen Rothwell]

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

Hi all,

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

In file included from <command-line>:32:
./usr/include/linux/f2fs.h:92:2: error: unknown type name 'u8'
   92 |  u8 algorithm;
      |  ^~
./usr/include/linux/f2fs.h:93:2: error: unknown type name 'u8'
   93 |  u8 log_cluster_size;
      |  ^~

Caused by commit

  63d18d4913e5 ("f2fs: add F2FS_IOC_GET_COMPRESS_OPTION ioctl")

You should only use the "__" versions of types in uapi headers.

I have used the version of the f2fs tree from next-20201102 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 f2fs tree

[Jaegeuk Kim]

On 05/02, Stephen Rothwell wrote:
> Hi Jaegeuk,
> 
> After merging the f2fs tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from include/trace/define_trace.h:96,
>                  from include/trace/events/f2fs.h:1724,
>                  from fs/f2fs/super.c:35:
> include/trace/events/f2fs.h: In function 'trace_raw_output_f2fs_filemap_fault':
> include/trace/events/f2fs.h:1310:3: error: '_entry' undeclared (first use in this function); did you mean 'dentry'?
>    _entry->ret)
>    ^~~~~~
> include/trace/trace_events.h:360:22: note: in definition of macro 'DECLARE_EVENT_CLASS'
>   trace_seq_printf(s, print);     \
>                       ^~~~~
> include/trace/trace_events.h:79:9: note: in expansion of macro 'PARAMS'
>          PARAMS(print));         \
>          ^~~~~~
> include/trace/events/f2fs.h:1287:1: note: in expansion of macro 'TRACE_EVENT'
>  TRACE_EVENT(f2fs_filemap_fault,
>  ^~~~~~~~~~~
> include/trace/events/f2fs.h:1307:2: note: in expansion of macro 'TP_printk'
>   TP_printk("dev = (%d,%d), ino = %lu, index = %lu, ret = %lx",
>   ^~~~~~~~~
> include/trace/events/f2fs.h:1310:3: note: each undeclared identifier is reported only once for each function it appears in
>    _entry->ret)
>    ^~~~~~
> include/trace/trace_events.h:360:22: note: in definition of macro 'DECLARE_EVENT_CLASS'
>   trace_seq_printf(s, print);     \
>                       ^~~~~
> include/trace/trace_events.h:79:9: note: in expansion of macro 'PARAMS'
>          PARAMS(print));         \
>          ^~~~~~
> include/trace/events/f2fs.h:1287:1: note: in expansion of macro 'TRACE_EVENT'
>  TRACE_EVENT(f2fs_filemap_fault,
>  ^~~~~~~~~~~
> include/trace/events/f2fs.h:1307:2: note: in expansion of macro 'TP_printk'
>   TP_printk("dev = (%d,%d), ino = %lu, index = %lu, ret = %lx",
>   ^~~~~~~~~
> 
> Caused by commit
> 
>   90a238561901 ("f2fs: add tracepoint for f2fs_filemap_fault()")
> 
> I have applied the following patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 2 May 2019 10:44:46 +1000
> Subject: [PATCH] f2fs: fix up for "f2fs: add tracepoint for
>  f2fs_filemap_fault()"
> 
> Fixes: 90a238561901 ("f2fs: add tracepoint for f2fs_filemap_fault()")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  include/trace/events/f2fs.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
> index 6a53c793cf20..53b96f12300c 100644
> --- a/include/trace/events/f2fs.h
> +++ b/include/trace/events/f2fs.h
> @@ -1307,7 +1307,7 @@ TRACE_EVENT(f2fs_filemap_fault,
>  	TP_printk("dev = (%d,%d), ino = %lu, index = %lu, ret = %lx",
>  		show_dev_ino(__entry),
>  		(unsigned long)__entry->index,
> -		_entry->ret)
> +		__entry->ret)

My bad. I was so hurried up. Uploaded again w/ fix.

Thanks,

>  );
>  
>  TRACE_EVENT(f2fs_writepages,
> -- 
> 2.20.1
> 
> -- 
> Cheers,
> Stephen Rothwell

linux-next: build failure after merge of the f2fs tree

[Stephen Rothwell]

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

Hi Jaegeuk,

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

In file included from include/trace/define_trace.h:96,
                 from include/trace/events/f2fs.h:1724,
                 from fs/f2fs/super.c:35:
include/trace/events/f2fs.h: In function 'trace_raw_output_f2fs_filemap_fault':
include/trace/events/f2fs.h:1310:3: error: '_entry' undeclared (first use in this function); did you mean 'dentry'?
   _entry->ret)
   ^~~~~~
include/trace/trace_events.h:360:22: note: in definition of macro 'DECLARE_EVENT_CLASS'
  trace_seq_printf(s, print);     \
                      ^~~~~
include/trace/trace_events.h:79:9: note: in expansion of macro 'PARAMS'
         PARAMS(print));         \
         ^~~~~~
include/trace/events/f2fs.h:1287:1: note: in expansion of macro 'TRACE_EVENT'
 TRACE_EVENT(f2fs_filemap_fault,
 ^~~~~~~~~~~
include/trace/events/f2fs.h:1307:2: note: in expansion of macro 'TP_printk'
  TP_printk("dev = (%d,%d), ino = %lu, index = %lu, ret = %lx",
  ^~~~~~~~~
include/trace/events/f2fs.h:1310:3: note: each undeclared identifier is reported only once for each function it appears in
   _entry->ret)
   ^~~~~~
include/trace/trace_events.h:360:22: note: in definition of macro 'DECLARE_EVENT_CLASS'
  trace_seq_printf(s, print);     \
                      ^~~~~
include/trace/trace_events.h:79:9: note: in expansion of macro 'PARAMS'
         PARAMS(print));         \
         ^~~~~~
include/trace/events/f2fs.h:1287:1: note: in expansion of macro 'TRACE_EVENT'
 TRACE_EVENT(f2fs_filemap_fault,
 ^~~~~~~~~~~
include/trace/events/f2fs.h:1307:2: note: in expansion of macro 'TP_printk'
  TP_printk("dev = (%d,%d), ino = %lu, index = %lu, ret = %lx",
  ^~~~~~~~~

Caused by commit

  90a238561901 ("f2fs: add tracepoint for f2fs_filemap_fault()")

I have applied the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 2 May 2019 10:44:46 +1000
Subject: [PATCH] f2fs: fix up for "f2fs: add tracepoint for
 f2fs_filemap_fault()"

Fixes: 90a238561901 ("f2fs: add tracepoint for f2fs_filemap_fault()")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/trace/events/f2fs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index 6a53c793cf20..53b96f12300c 100644
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -1307,7 +1307,7 @@ TRACE_EVENT(f2fs_filemap_fault,
 	TP_printk("dev = (%d,%d), ino = %lu, index = %lu, ret = %lx",
 		show_dev_ino(__entry),
 		(unsigned long)__entry->index,
-		_entry->ret)
+		__entry->ret)
 );
 
 TRACE_EVENT(f2fs_writepages,
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

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

linux-next: build failure after merge of the f2fs tree

[Stephen Rothwell]

Hi Jaegeuk,

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

/home/sfr/next/next/fs/f2fs/super.c: In function 'f2fs_fill_super':
/home/sfr/next/next/fs/f2fs/super.c:2563:18: error: 'SB_I_CGROUPWB' undeclared (first use in this function); did you mean 'S_CGROUPWB'?
  sb->s_iflags |= SB_I_CGROUPWB;
                  ^~~~~~~~~~~~~
                  S_CGROUPWB

Caused by commit

  578c647879f7 ("f2fs: implement cgroup writeback support")

interacting with commit

  34934189a3dd ("cgroup, writeback: replace SB_I_CGROUPWB with per-inode S_CGROUPWB"

from the btrfs tree.

I have reverted the f2fs tree commit for today, but a better resolution
would be appreciated.

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the f2fs tree

[Stephen Rothwell]

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

Hi Jaegeuk,

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

fs/f2fs/data.c: In function 'f2fs_write_begin':
fs/f2fs/data.c:960:19: error: 'fi' undeclared (first use in this function)
    set_inode_flag(fi, FI_DATA_EXIST);
                   ^

Caused by commit 2bac4643efc1 ("f2fs: revisit inline_data to avoid data
races and potential bugs").

I have used the f2fs tree from next-20141104 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

linux-next: build failure after merge of the f2fs tree

[Stephen Rothwell]

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

Hi Jaegeuk,

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

fs/f2fs/namei.c: In function 'f2fs_rename':
fs/f2fs/namei.c:450:31: error: expected ';' before ':' token
   update_inode_page(old_inode):
                               ^

Caused by commit 2e569fefc95a ("f2fs: fix omitting to update inode page").

Not even build tested :-(

I have used the f2fs tree from next-20130822 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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