From: Sasha Levin Date: Tue, 18 Feb 2020 18:17:55 +0000 (-0500) Subject: Drop ext4-simplify-checking-quota-limits-in-ext4_statfs.patch X-Git-Tag: v4.19.105~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac864196776fe01625a23efc835ed685c76552ee;p=thirdparty%2Fkernel%2Fstable-queue.git Drop ext4-simplify-checking-quota-limits-in-ext4_statfs.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.4/ext4-simplify-checking-quota-limits-in-ext4_statfs.patch b/queue-5.4/ext4-simplify-checking-quota-limits-in-ext4_statfs.patch deleted file mode 100644 index da6f5d9b869..00000000000 --- a/queue-5.4/ext4-simplify-checking-quota-limits-in-ext4_statfs.patch +++ /dev/null @@ -1,54 +0,0 @@ -From c8a2e05d5eb251c73fac79569cabd68cb1348fd8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 30 Jan 2020 12:11:48 +0100 -Subject: ext4: simplify checking quota limits in ext4_statfs() - -From: Jan Kara - -[ Upstream commit 46d36880d1c6f9b9a0cbaf90235355ea1f4cab96 ] - -Coverity reports that conditions checking quota limits in ext4_statfs() -contain dead code. Indeed it is right and current conditions can be -simplified. - -Link: https://lore.kernel.org/r/20200130111148.10766-1-jack@suse.cz -Reported-by: Coverity -Signed-off-by: Jan Kara -Signed-off-by: Theodore Ts'o -Cc: stable@kernel.org -Signed-off-by: Sasha Levin ---- - fs/ext4/super.c | 10 ++-------- - 1 file changed, 2 insertions(+), 8 deletions(-) - -diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index 914230e630544..c7a037db49326 100644 ---- a/fs/ext4/super.c -+++ b/fs/ext4/super.c -@@ -5540,10 +5540,7 @@ static int ext4_statfs_project(struct super_block *sb, - return PTR_ERR(dquot); - spin_lock(&dquot->dq_dqb_lock); - -- limit = 0; -- if (dquot->dq_dqb.dqb_bsoftlimit && -- (!limit || dquot->dq_dqb.dqb_bsoftlimit < limit)) -- limit = dquot->dq_dqb.dqb_bsoftlimit; -+ limit = dquot->dq_dqb.dqb_bsoftlimit; - if (dquot->dq_dqb.dqb_bhardlimit && - (!limit || dquot->dq_dqb.dqb_bhardlimit < limit)) - limit = dquot->dq_dqb.dqb_bhardlimit; -@@ -5558,10 +5555,7 @@ static int ext4_statfs_project(struct super_block *sb, - (buf->f_blocks - curblock) : 0; - } - -- limit = 0; -- if (dquot->dq_dqb.dqb_isoftlimit && -- (!limit || dquot->dq_dqb.dqb_isoftlimit < limit)) -- limit = dquot->dq_dqb.dqb_isoftlimit; -+ limit = dquot->dq_dqb.dqb_isoftlimit; - if (dquot->dq_dqb.dqb_ihardlimit && - (!limit || dquot->dq_dqb.dqb_ihardlimit < limit)) - limit = dquot->dq_dqb.dqb_ihardlimit; --- -2.20.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 0ca428f9b8b..91a0a04fdd8 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -61,7 +61,6 @@ revert-drm-sun4i-drv-allow-framebuffer-modifiers-in-mode-config.patch jbd2-move-the-clearing-of-b_modified-flag-to-the-jou.patch jbd2-do-not-clear-the-bh_mapped-flag-when-forgetting.patch ext4-choose-hardlimit-when-softlimit-is-larger-than-.patch -ext4-simplify-checking-quota-limits-in-ext4_statfs.patch kvm-x86-mmu-fix-struct-guest_walker-arrays-for-5-lev.patch gpio-add-gpiod_toggle_active_low.patch mmc-core-rework-wp-gpio-handling.patch diff --git a/queue-5.5/ext4-simplify-checking-quota-limits-in-ext4_statfs.patch b/queue-5.5/ext4-simplify-checking-quota-limits-in-ext4_statfs.patch deleted file mode 100644 index ee8ca53ca7f..00000000000 --- a/queue-5.5/ext4-simplify-checking-quota-limits-in-ext4_statfs.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 1730e33238477e6a78b22705f1d916078bf19435 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 30 Jan 2020 12:11:48 +0100 -Subject: ext4: simplify checking quota limits in ext4_statfs() - -From: Jan Kara - -[ Upstream commit 46d36880d1c6f9b9a0cbaf90235355ea1f4cab96 ] - -Coverity reports that conditions checking quota limits in ext4_statfs() -contain dead code. Indeed it is right and current conditions can be -simplified. - -Link: https://lore.kernel.org/r/20200130111148.10766-1-jack@suse.cz -Reported-by: Coverity -Signed-off-by: Jan Kara -Signed-off-by: Theodore Ts'o -Cc: stable@kernel.org -Signed-off-by: Sasha Levin ---- - fs/ext4/super.c | 10 ++-------- - 1 file changed, 2 insertions(+), 8 deletions(-) - -diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index c51d7ef2e4675..ae77d11d1a34b 100644 ---- a/fs/ext4/super.c -+++ b/fs/ext4/super.c -@@ -5536,10 +5536,7 @@ static int ext4_statfs_project(struct super_block *sb, - return PTR_ERR(dquot); - spin_lock(&dquot->dq_dqb_lock); - -- limit = 0; -- if (dquot->dq_dqb.dqb_bsoftlimit && -- (!limit || dquot->dq_dqb.dqb_bsoftlimit < limit)) -- limit = dquot->dq_dqb.dqb_bsoftlimit; -+ limit = dquot->dq_dqb.dqb_bsoftlimit; - if (dquot->dq_dqb.dqb_bhardlimit && - (!limit || dquot->dq_dqb.dqb_bhardlimit < limit)) - limit = dquot->dq_dqb.dqb_bhardlimit; -@@ -5554,10 +5551,7 @@ static int ext4_statfs_project(struct super_block *sb, - (buf->f_blocks - curblock) : 0; - } - -- limit = 0; -- if (dquot->dq_dqb.dqb_isoftlimit && -- (!limit || dquot->dq_dqb.dqb_isoftlimit < limit)) -- limit = dquot->dq_dqb.dqb_isoftlimit; -+ limit = dquot->dq_dqb.dqb_isoftlimit; - if (dquot->dq_dqb.dqb_ihardlimit && - (!limit || dquot->dq_dqb.dqb_ihardlimit < limit)) - limit = dquot->dq_dqb.dqb_ihardlimit; --- -2.20.1 - diff --git a/queue-5.5/series b/queue-5.5/series index 64f75159f3f..144eebbd1ff 100644 --- a/queue-5.5/series +++ b/queue-5.5/series @@ -74,7 +74,6 @@ nfsv4-ensure-the-delegation-cred-is-pinned-when-we-call-delegreturn.patch revert-drm-sun4i-drv-allow-framebuffer-modifiers-in-mode-config.patch drm-i915-pmu-correct-the-rc6-offset-upon-enabling.patch ext4-choose-hardlimit-when-softlimit-is-larger-than-.patch -ext4-simplify-checking-quota-limits-in-ext4_statfs.patch io-wq-add-support-for-inheriting-fs.patch nfsv4-add-accounting-for-the-number-of-active-delega.patch gpio-add-gpiod_toggle_active_low.patch