drop f2fs-avoid-build-warn-of-fall_through.patch from everywhere

diff --git a/queue-4.14/f2fs-avoid-build-warn-of-fall_through.patch b/queue-4.14/f2fs-avoid-build-warn-of-fall_through.patch
deleted file mode 100644 (file)
index 5a6de94..0000000
--- a/queue-4.14/f2fs-avoid-build-warn-of-fall_through.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b6dca37ea09e8e31e204e0ebd8789802ea1708d8 Mon Sep 17 00:00:00 2001
-From: Jaegeuk Kim <jaegeuk@kernel.org>
-Date: Mon, 26 Nov 2018 14:20:32 -0800
-Subject: f2fs: avoid build warn of fall_through
-
-[ Upstream commit f5d5510e7389fa264337fb524346bac9eb93adc8 ]
-
-After merging the f2fs tree, today's linux-next build
- (x86_64_allmodconfig) produced this warning:
-
- In file included from fs/f2fs/dir.c:11:
- fs/f2fs/f2fs.h: In function '__mark_inode_dirty_flag':
- fs/f2fs/f2fs.h:2388:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
-    if (set)
-       ^
- fs/f2fs/f2fs.h:2390:2: note: here
-   case FI_DATA_EXIST:
-   ^~~~
-
- Exposed by my use of -Wimplicit-fallthrough
-
-Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
-Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/f2fs/f2fs.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
-index 3f1a44696036..d2873f227072 100644
---- a/fs/f2fs/f2fs.h
-+++ b/fs/f2fs/f2fs.h
-@@ -2014,6 +2014,7 @@ static inline void __mark_inode_dirty_flag(struct inode *inode,
-       case FI_INLINE_DENTRY:
-               if (set)
-                       return;
-+              /* fall through */
-       case FI_DATA_EXIST:
-       case FI_INLINE_DOTS:
-               f2fs_mark_inode_dirty_sync(inode, true);
--- 
-2.19.1
-

diff --git a/queue-4.14/f2fs-fix-sbi-extent_list-corruption-issue.patch b/queue-4.14/f2fs-fix-sbi-extent_list-corruption-issue.patch
index e8db3dd15c8926c74c3d471d6c804cd9d909dda5..bcbc861b01eceba73b8f16f7185f95adaaaab179 100644 (file)
--- a/queue-4.14/f2fs-fix-sbi-extent_list-corruption-issue.patch
+++ b/queue-4.14/f2fs-fix-sbi-extent_list-corruption-issue.patch
@@ -46,15 +46,13 @@ Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
 Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- fs/f2fs/f2fs.h     | 11 ++++++++++-
- fs/f2fs/shrinker.c |  2 +-
+ fs/f2fs/f2fs.h     |   11 ++++++++++-
+ fs/f2fs/shrinker.c |    2 +-
  2 files changed, 11 insertions(+), 2 deletions(-)
 
-diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
-index d2873f227072..64760314c5f2 100644
 --- a/fs/f2fs/f2fs.h
 +++ b/fs/f2fs/f2fs.h
-@@ -2295,10 +2295,19 @@ static inline bool is_dot_dotdot(const struct qstr *str)
+@@ -2294,10 +2294,19 @@ static inline bool is_dot_dotdot(const s
  
  static inline bool f2fs_may_extent_tree(struct inode *inode)
  {
@@ -75,11 +73,9 @@ index d2873f227072..64760314c5f2 100644
        return S_ISREG(inode->i_mode);
  }
  
-diff --git a/fs/f2fs/shrinker.c b/fs/f2fs/shrinker.c
-index 5c60fc28ec75..ec71d2e29a15 100644
 --- a/fs/f2fs/shrinker.c
 +++ b/fs/f2fs/shrinker.c
-@@ -138,6 +138,6 @@ void f2fs_leave_shrinker(struct f2fs_sb_info *sbi)
+@@ -138,6 +138,6 @@ void f2fs_leave_shrinker(struct f2fs_sb_
        f2fs_shrink_extent_tree(sbi, __count_extent_cache(sbi));
  
        spin_lock(&f2fs_list_lock);
@@ -87,6 +83,3 @@ index 5c60fc28ec75..ec71d2e29a15 100644
 +      list_del_init(&sbi->s_list);
        spin_unlock(&f2fs_list_lock);
  }
--- 
-2.19.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index a7ba92a692fb525096615d176242fe8c6be14581..8c7903516d497ca454bf1a6fe9869e6f278ca5a3 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -40,7 +40,6 @@ media-adv-tc358743-ths8200-fill-in-min-width-height-.patch
 acpi-spcr-consider-baud-rate-0-as-preconfigured-stat.patch
 staging-pi433-fix-potential-null-dereference.patch
 f2fs-move-dir-data-flush-to-write-checkpoint-process.patch
-f2fs-avoid-build-warn-of-fall_through.patch
 f2fs-fix-race-between-write_checkpoint-and-write_beg.patch
 f2fs-fix-wrong-return-value-of-f2fs_acl_create.patch
 i2c-sh_mobile-add-support-for-r8a77990-r-car-e3.patch

diff --git a/queue-4.19/f2fs-avoid-build-warn-of-fall_through.patch b/queue-4.19/f2fs-avoid-build-warn-of-fall_through.patch
deleted file mode 100644 (file)
index 0198ac9..0000000
--- a/queue-4.19/f2fs-avoid-build-warn-of-fall_through.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 8282f1acdb7a41371ea4782008d71d480e33e039 Mon Sep 17 00:00:00 2001
-From: Jaegeuk Kim <jaegeuk@kernel.org>
-Date: Mon, 26 Nov 2018 14:20:32 -0800
-Subject: f2fs: avoid build warn of fall_through
-
-[ Upstream commit f5d5510e7389fa264337fb524346bac9eb93adc8 ]
-
-After merging the f2fs tree, today's linux-next build
- (x86_64_allmodconfig) produced this warning:
-
- In file included from fs/f2fs/dir.c:11:
- fs/f2fs/f2fs.h: In function '__mark_inode_dirty_flag':
- fs/f2fs/f2fs.h:2388:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
-    if (set)
-       ^
- fs/f2fs/f2fs.h:2390:2: note: here
-   case FI_DATA_EXIST:
-   ^~~~
-
- Exposed by my use of -Wimplicit-fallthrough
-
-Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
-Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/f2fs/f2fs.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
-index ecb735142276..462a2fb8aa69 100644
---- a/fs/f2fs/f2fs.h
-+++ b/fs/f2fs/f2fs.h
-@@ -2311,6 +2311,7 @@ static inline void __mark_inode_dirty_flag(struct inode *inode,
-       case FI_NEW_INODE:
-               if (set)
-                       return;
-+              /* fall through */
-       case FI_DATA_EXIST:
-       case FI_INLINE_DOTS:
-       case FI_PIN_FILE:
--- 
-2.19.1
-

diff --git a/queue-4.19/f2fs-fix-sbi-extent_list-corruption-issue.patch b/queue-4.19/f2fs-fix-sbi-extent_list-corruption-issue.patch
index e29a74f26b5b86419d7d9530f55f8e6d892ea3d4..b55bab10ecf9c41e74711cde2fd38b8527cd596c 100644 (file)
--- a/queue-4.19/f2fs-fix-sbi-extent_list-corruption-issue.patch
+++ b/queue-4.19/f2fs-fix-sbi-extent_list-corruption-issue.patch
@@ -46,15 +46,13 @@ Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
 Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- fs/f2fs/f2fs.h     | 11 ++++++++++-
- fs/f2fs/shrinker.c |  2 +-
+ fs/f2fs/f2fs.h     |   11 ++++++++++-
+ fs/f2fs/shrinker.c |    2 +-
  2 files changed, 11 insertions(+), 2 deletions(-)
 
-diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
-index 462a2fb8aa69..eea2811dc672 100644
 --- a/fs/f2fs/f2fs.h
 +++ b/fs/f2fs/f2fs.h
-@@ -2614,10 +2614,19 @@ static inline bool is_dot_dotdot(const struct qstr *str)
+@@ -2613,10 +2613,19 @@ static inline bool is_dot_dotdot(const s
  
  static inline bool f2fs_may_extent_tree(struct inode *inode)
  {
@@ -75,11 +73,9 @@ index 462a2fb8aa69..eea2811dc672 100644
        return S_ISREG(inode->i_mode);
  }
  
-diff --git a/fs/f2fs/shrinker.c b/fs/f2fs/shrinker.c
-index 36cfd816c160..29042e6d5126 100644
 --- a/fs/f2fs/shrinker.c
 +++ b/fs/f2fs/shrinker.c
-@@ -138,6 +138,6 @@ void f2fs_leave_shrinker(struct f2fs_sb_info *sbi)
+@@ -138,6 +138,6 @@ void f2fs_leave_shrinker(struct f2fs_sb_
        f2fs_shrink_extent_tree(sbi, __count_extent_cache(sbi));
  
        spin_lock(&f2fs_list_lock);
@@ -87,6 +83,3 @@ index 36cfd816c160..29042e6d5126 100644
 +      list_del_init(&sbi->s_list);
        spin_unlock(&f2fs_list_lock);
  }
--- 
-2.19.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index dc6e593a883a6516834704ce415613b08d4cf409..4d1d29db7e41b21b32e53f75b2a42d24951fbb73 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -64,7 +64,6 @@ media-adv-tc358743-ths8200-fill-in-min-width-height-.patch
 acpi-spcr-consider-baud-rate-0-as-preconfigured-stat.patch
 staging-pi433-fix-potential-null-dereference.patch
 f2fs-move-dir-data-flush-to-write-checkpoint-process.patch
-f2fs-avoid-build-warn-of-fall_through.patch
 f2fs-fix-race-between-write_checkpoint-and-write_beg.patch
 f2fs-fix-wrong-return-value-of-f2fs_acl_create.patch
 i2c-sh_mobile-add-support-for-r8a77990-r-car-e3.patch

diff --git a/queue-4.20/f2fs-avoid-build-warn-of-fall_through.patch b/queue-4.20/f2fs-avoid-build-warn-of-fall_through.patch
deleted file mode 100644 (file)
index 5199de5..0000000
--- a/queue-4.20/f2fs-avoid-build-warn-of-fall_through.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f5f7792b95af25d45b68f759b2f58c497fe7f360 Mon Sep 17 00:00:00 2001
-From: Jaegeuk Kim <jaegeuk@kernel.org>
-Date: Mon, 26 Nov 2018 14:20:32 -0800
-Subject: f2fs: avoid build warn of fall_through
-
-[ Upstream commit f5d5510e7389fa264337fb524346bac9eb93adc8 ]
-
-After merging the f2fs tree, today's linux-next build
- (x86_64_allmodconfig) produced this warning:
-
- In file included from fs/f2fs/dir.c:11:
- fs/f2fs/f2fs.h: In function '__mark_inode_dirty_flag':
- fs/f2fs/f2fs.h:2388:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
-    if (set)
-       ^
- fs/f2fs/f2fs.h:2390:2: note: here
-   case FI_DATA_EXIST:
-   ^~~~
-
- Exposed by my use of -Wimplicit-fallthrough
-
-Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
-Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/f2fs/f2fs.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
-index 1e031971a466..ebad864c031c 100644
---- a/fs/f2fs/f2fs.h
-+++ b/fs/f2fs/f2fs.h
-@@ -2370,6 +2370,7 @@ static inline void __mark_inode_dirty_flag(struct inode *inode,
-       case FI_NEW_INODE:
-               if (set)
-                       return;
-+              /* fall through */
-       case FI_DATA_EXIST:
-       case FI_INLINE_DOTS:
-       case FI_PIN_FILE:
--- 
-2.19.1
-

diff --git a/queue-4.20/f2fs-fix-sbi-extent_list-corruption-issue.patch b/queue-4.20/f2fs-fix-sbi-extent_list-corruption-issue.patch
index 2d6c2ba90b574310788a21ef551bbc70073e6a45..59bccf590e28a59d944e484210edc0a001b1d786 100644 (file)
--- a/queue-4.20/f2fs-fix-sbi-extent_list-corruption-issue.patch
+++ b/queue-4.20/f2fs-fix-sbi-extent_list-corruption-issue.patch
@@ -46,15 +46,13 @@ Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
 Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- fs/f2fs/f2fs.h     | 11 ++++++++++-
- fs/f2fs/shrinker.c |  2 +-
+ fs/f2fs/f2fs.h     |   11 ++++++++++-
+ fs/f2fs/shrinker.c |    2 +-
  2 files changed, 11 insertions(+), 2 deletions(-)
 
-diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
-index ebad864c031c..6713060a59fb 100644
 --- a/fs/f2fs/f2fs.h
 +++ b/fs/f2fs/f2fs.h
-@@ -2673,10 +2673,19 @@ static inline bool is_dot_dotdot(const struct qstr *str)
+@@ -2672,10 +2672,19 @@ static inline bool is_dot_dotdot(const s
  
  static inline bool f2fs_may_extent_tree(struct inode *inode)
  {
@@ -75,11 +73,9 @@ index ebad864c031c..6713060a59fb 100644
        return S_ISREG(inode->i_mode);
  }
  
-diff --git a/fs/f2fs/shrinker.c b/fs/f2fs/shrinker.c
-index 9e13db994fdf..a467aca29cfe 100644
 --- a/fs/f2fs/shrinker.c
 +++ b/fs/f2fs/shrinker.c
-@@ -135,6 +135,6 @@ void f2fs_leave_shrinker(struct f2fs_sb_info *sbi)
+@@ -135,6 +135,6 @@ void f2fs_leave_shrinker(struct f2fs_sb_
        f2fs_shrink_extent_tree(sbi, __count_extent_cache(sbi));
  
        spin_lock(&f2fs_list_lock);
@@ -87,6 +83,3 @@ index 9e13db994fdf..a467aca29cfe 100644
 +      list_del_init(&sbi->s_list);
        spin_unlock(&f2fs_list_lock);
  }
--- 
-2.19.1
-

diff --git a/queue-4.20/series b/queue-4.20/series
index 751b1a7cac0e6a9b8dcfc675cda30451fb2d1a16..9dd6153fa534b28f2cacb8124aeb364b57450fc6 100644 (file)
--- a/queue-4.20/series
+++ b/queue-4.20/series
@@ -76,7 +76,6 @@ acpi-spcr-consider-baud-rate-0-as-preconfigured-stat.patch
 staging-pi433-fix-potential-null-dereference.patch
 f2fs-avoid-gc-causing-encrypted-file-corrupted.patch
 f2fs-move-dir-data-flush-to-write-checkpoint-process.patch
-f2fs-avoid-build-warn-of-fall_through.patch
 f2fs-fix-race-between-write_checkpoint-and-write_beg.patch
 f2fs-fix-wrong-return-value-of-f2fs_acl_create.patch
 i2c-sh_mobile-add-support-for-r8a77990-r-car-e3.patch

diff --git a/queue-4.9/f2fs-avoid-build-warn-of-fall_through.patch b/queue-4.9/f2fs-avoid-build-warn-of-fall_through.patch
deleted file mode 100644 (file)
index 4ec3a44..0000000
--- a/queue-4.9/f2fs-avoid-build-warn-of-fall_through.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 12ef0be5dbfdc31db1f75addcb6c3553a7827461 Mon Sep 17 00:00:00 2001
-From: Jaegeuk Kim <jaegeuk@kernel.org>
-Date: Mon, 26 Nov 2018 14:20:32 -0800
-Subject: f2fs: avoid build warn of fall_through
-
-[ Upstream commit f5d5510e7389fa264337fb524346bac9eb93adc8 ]
-
-After merging the f2fs tree, today's linux-next build
- (x86_64_allmodconfig) produced this warning:
-
- In file included from fs/f2fs/dir.c:11:
- fs/f2fs/f2fs.h: In function '__mark_inode_dirty_flag':
- fs/f2fs/f2fs.h:2388:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
-    if (set)
-       ^
- fs/f2fs/f2fs.h:2390:2: note: here
-   case FI_DATA_EXIST:
-   ^~~~
-
- Exposed by my use of -Wimplicit-fallthrough
-
-Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
-Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/f2fs/f2fs.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
-index 9c380885b0fc..662084490089 100644
---- a/fs/f2fs/f2fs.h
-+++ b/fs/f2fs/f2fs.h
-@@ -1635,6 +1635,7 @@ static inline void __mark_inode_dirty_flag(struct inode *inode,
-       case FI_INLINE_DENTRY:
-               if (set)
-                       return;
-+              /* fall through */
-       case FI_DATA_EXIST:
-       case FI_INLINE_DOTS:
-               f2fs_mark_inode_dirty_sync(inode);
--- 
-2.19.1
-

diff --git a/queue-4.9/f2fs-fix-sbi-extent_list-corruption-issue.patch b/queue-4.9/f2fs-fix-sbi-extent_list-corruption-issue.patch
index 8ea6cf608bc8b789205f9cdaf7b03a379c0c454c..9a2340c5235ad8dcece23823d6b5be06c9c6eba2 100644 (file)
--- a/queue-4.9/f2fs-fix-sbi-extent_list-corruption-issue.patch
+++ b/queue-4.9/f2fs-fix-sbi-extent_list-corruption-issue.patch
@@ -46,15 +46,13 @@ Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
 Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- fs/f2fs/f2fs.h     | 11 ++++++++++-
- fs/f2fs/shrinker.c |  2 +-
+ fs/f2fs/f2fs.h     |   11 ++++++++++-
+ fs/f2fs/shrinker.c |    2 +-
  2 files changed, 11 insertions(+), 2 deletions(-)
 
-diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
-index 662084490089..6c069c9c0bb6 100644
 --- a/fs/f2fs/f2fs.h
 +++ b/fs/f2fs/f2fs.h
-@@ -1886,10 +1886,19 @@ static inline bool is_dot_dotdot(const struct qstr *str)
+@@ -1885,10 +1885,19 @@ static inline bool is_dot_dotdot(const s
  
  static inline bool f2fs_may_extent_tree(struct inode *inode)
  {
@@ -75,11 +73,9 @@ index 662084490089..6c069c9c0bb6 100644
        return S_ISREG(inode->i_mode);
  }
  
-diff --git a/fs/f2fs/shrinker.c b/fs/f2fs/shrinker.c
-index 46c915425923..a40bfa7fafec 100644
 --- a/fs/f2fs/shrinker.c
 +++ b/fs/f2fs/shrinker.c
-@@ -136,6 +136,6 @@ void f2fs_leave_shrinker(struct f2fs_sb_info *sbi)
+@@ -136,6 +136,6 @@ void f2fs_leave_shrinker(struct f2fs_sb_
        f2fs_shrink_extent_tree(sbi, __count_extent_cache(sbi));
  
        spin_lock(&f2fs_list_lock);
@@ -87,6 +83,3 @@ index 46c915425923..a40bfa7fafec 100644
 +      list_del_init(&sbi->s_list);
        spin_unlock(&f2fs_list_lock);
  }
--- 
-2.19.1
-

diff --git a/queue-4.9/series b/queue-4.9/series
index 72601b5ba00824a10beedbbad0a2947ae3432e9d..5705864eca3ad158269361891ef55c8fd6e16aa4 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -22,7 +22,6 @@ dmaengine-xilinx_dma-remove-__aligned-attribute-on-z.patch
 iio-accel-kxcjk1013-add-kiox010a-acpi-hardware-id.patch
 media-adv-tc358743-ths8200-fill-in-min-width-height-.patch
 f2fs-move-dir-data-flush-to-write-checkpoint-process.patch
-f2fs-avoid-build-warn-of-fall_through.patch
 f2fs-fix-wrong-return-value-of-f2fs_acl_create.patch
 sunvdc-do-not-spin-in-an-infinite-loop-when-vio_ldc_.patch
 soc-bcm-brcmstb-don-t-leak-device-tree-node-referenc.patch