From: Greg Kroah-Hartman Date: Sat, 4 Jan 2020 11:55:15 +0000 (+0100) Subject: drop f2fs-choose-hardlimit-when-softlimit-is-larger-than-.patch from everywhere X-Git-Tag: v4.4.208~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8f5fd6a2f76756c85b6ba00f66a4607859c42ad;p=thirdparty%2Fkernel%2Fstable-queue.git drop f2fs-choose-hardlimit-when-softlimit-is-larger-than-.patch from everywhere --- diff --git a/queue-4.14/f2fs-choose-hardlimit-when-softlimit-is-larger-than-.patch b/queue-4.14/f2fs-choose-hardlimit-when-softlimit-is-larger-than-.patch deleted file mode 100644 index db3d2734e33..00000000000 --- a/queue-4.14/f2fs-choose-hardlimit-when-softlimit-is-larger-than-.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 08e2cc5d4082aaca040bd8ebcff50429c0e41627 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 25 Nov 2019 11:20:36 +0800 -Subject: f2fs: choose hardlimit when softlimit is larger than hardlimit in - f2fs_statfs_project() - -From: Chengguang Xu - -[ Upstream commit 909110c060f22e65756659ec6fa957ae75777e00 ] - -Setting softlimit larger than hardlimit seems meaningless -for disk quota but currently it is allowed. In this case, -there may be a bit of comfusion for users when they run -df comamnd to directory which has project quota. - -For example, we set 20M softlimit and 10M hardlimit of -block usage limit for project quota of test_dir(project id 123). - -[root@hades f2fs]# repquota -P -a -*** Report for project quotas on device /dev/nvme0n1p8 -Block grace time: 7days; Inode grace time: 7days -Block limits File limits -Project used soft hard grace used soft hard grace ----------------------------------------------------------------------- -0 -- 4 0 0 1 0 0 -123 +- 10248 20480 10240 2 0 0 - -The result of df command as below: - -[root@hades f2fs]# df -h /mnt/f2fs/test -Filesystem Size Used Avail Use% Mounted on -/dev/nvme0n1p8 20M 11M 10M 51% /mnt/f2fs - -Even though it looks like there is another 10M free space to use, -if we write new data to diretory test(inherit project id), -the write will fail with errno(-EDQUOT). - -After this patch, the df result looks like below. - -[root@hades f2fs]# df -h /mnt/f2fs/test -Filesystem Size Used Avail Use% Mounted on -/dev/nvme0n1p8 10M 10M 0 100% /mnt/f2fs - -Signed-off-by: Chengguang Xu -Reviewed-by: Chao Yu -Signed-off-by: Jaegeuk Kim -Signed-off-by: Sasha Levin ---- - fs/f2fs/super.c | 20 ++++++++++++++------ - 1 file changed, 14 insertions(+), 6 deletions(-) - -diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c -index e4aabfc21bd4..8635df6cba55 100644 ---- a/fs/f2fs/super.c -+++ b/fs/f2fs/super.c -@@ -912,9 +912,13 @@ static int f2fs_statfs_project(struct super_block *sb, - return PTR_ERR(dquot); - spin_lock(&dq_data_lock); - -- limit = (dquot->dq_dqb.dqb_bsoftlimit ? -- dquot->dq_dqb.dqb_bsoftlimit : -- dquot->dq_dqb.dqb_bhardlimit) >> sb->s_blocksize_bits; -+ limit = 0; -+ if (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; -+ - if (limit && buf->f_blocks > limit) { - curblock = dquot->dq_dqb.dqb_curspace >> sb->s_blocksize_bits; - buf->f_blocks = limit; -@@ -923,9 +927,13 @@ static int f2fs_statfs_project(struct super_block *sb, - (buf->f_blocks - curblock) : 0; - } - -- limit = dquot->dq_dqb.dqb_isoftlimit ? -- dquot->dq_dqb.dqb_isoftlimit : -- dquot->dq_dqb.dqb_ihardlimit; -+ limit = 0; -+ if (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; -+ - if (limit && buf->f_files > limit) { - buf->f_files = limit; - buf->f_ffree = --- -2.20.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 13062692f0b..d8a7a98ffc0 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -42,7 +42,6 @@ scsi-target-iscsi-wait-for-all-commands-to-finish-be.patch gpio-mpc8xxx-don-t-overwrite-default-irq_set_type-ca.patch apparmor-fix-unsigned-len-comparison-with-less-than-.patch scripts-kallsyms-fix-definitely-lost-memory-leak.patch -f2fs-choose-hardlimit-when-softlimit-is-larger-than-.patch cdrom-respect-device-capabilities-during-opening-act.patch perf-script-fix-brstackinsn-for-auxtrace.patch perf-regs-make-perf_reg_name-return-unknown-instead-.patch diff --git a/queue-4.19/f2fs-choose-hardlimit-when-softlimit-is-larger-than-.patch b/queue-4.19/f2fs-choose-hardlimit-when-softlimit-is-larger-than-.patch deleted file mode 100644 index fa2cd4fea39..00000000000 --- a/queue-4.19/f2fs-choose-hardlimit-when-softlimit-is-larger-than-.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 631661a7b5fb83fc16058509af78355c829e9c2d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 25 Nov 2019 11:20:36 +0800 -Subject: f2fs: choose hardlimit when softlimit is larger than hardlimit in - f2fs_statfs_project() - -From: Chengguang Xu - -[ Upstream commit 909110c060f22e65756659ec6fa957ae75777e00 ] - -Setting softlimit larger than hardlimit seems meaningless -for disk quota but currently it is allowed. In this case, -there may be a bit of comfusion for users when they run -df comamnd to directory which has project quota. - -For example, we set 20M softlimit and 10M hardlimit of -block usage limit for project quota of test_dir(project id 123). - -[root@hades f2fs]# repquota -P -a -*** Report for project quotas on device /dev/nvme0n1p8 -Block grace time: 7days; Inode grace time: 7days -Block limits File limits -Project used soft hard grace used soft hard grace ----------------------------------------------------------------------- -0 -- 4 0 0 1 0 0 -123 +- 10248 20480 10240 2 0 0 - -The result of df command as below: - -[root@hades f2fs]# df -h /mnt/f2fs/test -Filesystem Size Used Avail Use% Mounted on -/dev/nvme0n1p8 20M 11M 10M 51% /mnt/f2fs - -Even though it looks like there is another 10M free space to use, -if we write new data to diretory test(inherit project id), -the write will fail with errno(-EDQUOT). - -After this patch, the df result looks like below. - -[root@hades f2fs]# df -h /mnt/f2fs/test -Filesystem Size Used Avail Use% Mounted on -/dev/nvme0n1p8 10M 10M 0 100% /mnt/f2fs - -Signed-off-by: Chengguang Xu -Reviewed-by: Chao Yu -Signed-off-by: Jaegeuk Kim -Signed-off-by: Sasha Levin ---- - fs/f2fs/super.c | 20 ++++++++++++++------ - 1 file changed, 14 insertions(+), 6 deletions(-) - -diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c -index 7a9cc64f5ca3..662c7de58b99 100644 ---- a/fs/f2fs/super.c -+++ b/fs/f2fs/super.c -@@ -1148,9 +1148,13 @@ static int f2fs_statfs_project(struct super_block *sb, - return PTR_ERR(dquot); - spin_lock(&dquot->dq_dqb_lock); - -- limit = (dquot->dq_dqb.dqb_bsoftlimit ? -- dquot->dq_dqb.dqb_bsoftlimit : -- dquot->dq_dqb.dqb_bhardlimit) >> sb->s_blocksize_bits; -+ limit = 0; -+ if (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; -+ - if (limit && buf->f_blocks > limit) { - curblock = dquot->dq_dqb.dqb_curspace >> sb->s_blocksize_bits; - buf->f_blocks = limit; -@@ -1159,9 +1163,13 @@ static int f2fs_statfs_project(struct super_block *sb, - (buf->f_blocks - curblock) : 0; - } - -- limit = dquot->dq_dqb.dqb_isoftlimit ? -- dquot->dq_dqb.dqb_isoftlimit : -- dquot->dq_dqb.dqb_ihardlimit; -+ limit = 0; -+ if (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; -+ - if (limit && buf->f_files > limit) { - buf->f_files = limit; - buf->f_ffree = --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index f9270cdbe8c..5f5021aecc7 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -59,7 +59,6 @@ gpio-mpc8xxx-don-t-overwrite-default-irq_set_type-ca.patch apparmor-fix-unsigned-len-comparison-with-less-than-.patch scripts-kallsyms-fix-definitely-lost-memory-leak.patch powerpc-don-t-add-mabi-flags-when-building-with-clan.patch -f2fs-choose-hardlimit-when-softlimit-is-larger-than-.patch cdrom-respect-device-capabilities-during-opening-act.patch perf-script-fix-brstackinsn-for-auxtrace.patch perf-regs-make-perf_reg_name-return-unknown-instead-.patch diff --git a/queue-5.4/f2fs-choose-hardlimit-when-softlimit-is-larger-than-.patch b/queue-5.4/f2fs-choose-hardlimit-when-softlimit-is-larger-than-.patch deleted file mode 100644 index 2c71c512606..00000000000 --- a/queue-5.4/f2fs-choose-hardlimit-when-softlimit-is-larger-than-.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 4a2869ce8e18dbe8954fa070a2a66e9f1871fc2f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 25 Nov 2019 11:20:36 +0800 -Subject: f2fs: choose hardlimit when softlimit is larger than hardlimit in - f2fs_statfs_project() - -From: Chengguang Xu - -[ Upstream commit 909110c060f22e65756659ec6fa957ae75777e00 ] - -Setting softlimit larger than hardlimit seems meaningless -for disk quota but currently it is allowed. In this case, -there may be a bit of comfusion for users when they run -df comamnd to directory which has project quota. - -For example, we set 20M softlimit and 10M hardlimit of -block usage limit for project quota of test_dir(project id 123). - -[root@hades f2fs]# repquota -P -a -*** Report for project quotas on device /dev/nvme0n1p8 -Block grace time: 7days; Inode grace time: 7days -Block limits File limits -Project used soft hard grace used soft hard grace ----------------------------------------------------------------------- -0 -- 4 0 0 1 0 0 -123 +- 10248 20480 10240 2 0 0 - -The result of df command as below: - -[root@hades f2fs]# df -h /mnt/f2fs/test -Filesystem Size Used Avail Use% Mounted on -/dev/nvme0n1p8 20M 11M 10M 51% /mnt/f2fs - -Even though it looks like there is another 10M free space to use, -if we write new data to diretory test(inherit project id), -the write will fail with errno(-EDQUOT). - -After this patch, the df result looks like below. - -[root@hades f2fs]# df -h /mnt/f2fs/test -Filesystem Size Used Avail Use% Mounted on -/dev/nvme0n1p8 10M 10M 0 100% /mnt/f2fs - -Signed-off-by: Chengguang Xu -Reviewed-by: Chao Yu -Signed-off-by: Jaegeuk Kim -Signed-off-by: Sasha Levin ---- - fs/f2fs/super.c | 20 ++++++++++++++------ - 1 file changed, 14 insertions(+), 6 deletions(-) - -diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c -index 1443cee15863..a2af155567b8 100644 ---- a/fs/f2fs/super.c -+++ b/fs/f2fs/super.c -@@ -1213,9 +1213,13 @@ static int f2fs_statfs_project(struct super_block *sb, - return PTR_ERR(dquot); - spin_lock(&dquot->dq_dqb_lock); - -- limit = (dquot->dq_dqb.dqb_bsoftlimit ? -- dquot->dq_dqb.dqb_bsoftlimit : -- dquot->dq_dqb.dqb_bhardlimit) >> sb->s_blocksize_bits; -+ limit = 0; -+ if (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; -+ - if (limit && buf->f_blocks > limit) { - curblock = dquot->dq_dqb.dqb_curspace >> sb->s_blocksize_bits; - buf->f_blocks = limit; -@@ -1224,9 +1228,13 @@ static int f2fs_statfs_project(struct super_block *sb, - (buf->f_blocks - curblock) : 0; - } - -- limit = dquot->dq_dqb.dqb_isoftlimit ? -- dquot->dq_dqb.dqb_isoftlimit : -- dquot->dq_dqb.dqb_ihardlimit; -+ limit = 0; -+ if (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; -+ - if (limit && buf->f_files > limit) { - buf->f_files = limit; - buf->f_ffree = --- -2.20.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 6f9f07ede06..d05420aba09 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -105,7 +105,6 @@ apparmor-fix-unsigned-len-comparison-with-less-than-.patch drm-amdgpu-call-find_vma-under-mmap_sem.patch scripts-kallsyms-fix-definitely-lost-memory-leak.patch powerpc-don-t-add-mabi-flags-when-building-with-clan.patch -f2fs-choose-hardlimit-when-softlimit-is-larger-than-.patch cifs-fix-use-after-free-bug-in-cifs_reconnect.patch um-virtio-keep-reading-on-eagain.patch io_uring-io_allocate_scq_urings-should-return-a-sane.patch