Stable Archive on lore.kernel.org
 help / color / Atom feed
* [4.19.y PATCH] tmpfs: fix unable to remount nr_inodes from limited to unlimited
@ 2019-12-04 13:11 yu kuai
  2019-12-04 17:31 ` Greg KH
  2019-12-04 17:33 ` Greg KH
  0 siblings, 2 replies; 6+ messages in thread
From: yu kuai @ 2019-12-04 13:11 UTC (permalink / raw)
  To: stable, gregkh, hughd, viro; +Cc: yi.zhang, zhengbin13, yukuai3, houtao1

tmpfs support 'size', 'nr_blocks' and 'nr_inodes' mount options. mount or
remount them to zero means unlimited. 'size' and 'br_blocks' can remount
from limited to unlimited, while 'nr_inodes' can't.

The problem is fixed since upstream commit 0b5071dd323d ("
shmem_parse_options(): use a separate structure to keep the results"). But
in order to backport it, the amount of related patches need to backport is
huge. 

So, I made some local changes to fix the problem.

Signed-off-by: yu kuai <yukuai3@huawei.com>
---
 mm/shmem.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mm/shmem.c b/mm/shmem.c
index 3c8742655756..966fc69ee8fb 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -3444,7 +3444,7 @@ static int shmem_remount_fs(struct super_block *sb, int *flags, char *data)
 	inodes = sbinfo->max_inodes - sbinfo->free_inodes;
 	if (percpu_counter_compare(&sbinfo->used_blocks, config.max_blocks) > 0)
 		goto out;
-	if (config.max_inodes < inodes)
+	if (config.max_inodes && config.max_inodes < inodes)
 		goto out;
 	/*
 	 * Those tests disallow limited->unlimited while any are in use;
@@ -3460,7 +3460,10 @@ static int shmem_remount_fs(struct super_block *sb, int *flags, char *data)
 	sbinfo->huge = config.huge;
 	sbinfo->max_blocks  = config.max_blocks;
 	sbinfo->max_inodes  = config.max_inodes;
-	sbinfo->free_inodes = config.max_inodes - inodes;
+	if (!config.max_inodes)
+		sbinfo->free_inodes = 0;
+	else
+		sbinfo->free_inodes = config.max_inodes - inodes;
 
 	/*
 	 * Preserve previous mempolicy unless mpol remount option was specified.
-- 
2.17.2


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, back to index

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-04 13:11 [4.19.y PATCH] tmpfs: fix unable to remount nr_inodes from limited to unlimited yu kuai
2019-12-04 17:31 ` Greg KH
2019-12-04 17:33 ` Greg KH
2019-12-04 20:13   ` Hugh Dickins
2019-12-05  1:41     ` yukuai (C)
2019-12-05  1:22   ` yukuai (C)

Stable Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ https://lore.kernel.org/stable \
		stable@vger.kernel.org
	public-inbox-index stable

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git