From patchwork Sat Sep 19 04:20:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 11786639 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5F83B6CA for ; Sat, 19 Sep 2020 04:20:22 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 16FEF21D43 for ; Sat, 19 Sep 2020 04:20:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="S6ST7Kl1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 16FEF21D43 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id EF2546B0068; Sat, 19 Sep 2020 00:20:20 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E7AF36B006C; Sat, 19 Sep 2020 00:20:20 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D46176B006E; Sat, 19 Sep 2020 00:20:20 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0162.hostedemail.com [216.40.44.162]) by kanga.kvack.org (Postfix) with ESMTP id BDBB76B0068 for ; Sat, 19 Sep 2020 00:20:20 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 6765E181AEF1E for ; Sat, 19 Sep 2020 04:20:20 +0000 (UTC) X-FDA: 77278509000.13.food22_3e0cd7127130 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin13.hostedemail.com (Postfix) with ESMTP id 45EFA18140B67 for ; Sat, 19 Sep 2020 04:20:20 +0000 (UTC) X-Spam-Summary: 1,0,0,1071f5c174e8edcb,d41d8cd98f00b204,akpm@linux-foundation.org,,RULES_HIT:41:355:379:800:960:966:967:973:988:989:1260:1345:1359:1381:1431:1437:1534:1541:1711:1730:1747:1777:1792:2196:2198:2199:2200:2393:2525:2559:2563:2682:2685:2859:2902:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3352:3865:3866:3867:3870:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:4385:5007:6261:6653:7576:8660:9025:9545:10004:11026:11658:11914:12043:12048:12297:12517:12519:12555:12679:12986:13069:13148:13230:13311:13357:13846:14130:14181:14384:14721:21080:21451:21627:21939:21990:30054:30069,0,RBL:198.145.29.99:@linux-foundation.org:.lbl8.mailshell.net-62.2.0.100 64.100.201.201;04y8wpopyet5sgrwh3zhww8b6p6e4ycmspqdigzd8sqxsw5my4d5ayuy3k6ng3x.kmhee8646thnf3gwzt9giq5c38ac4ohu19gx4smct1wxnkmaku97i6cojdo3jdq.a-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules: 0:0:0,LF X-HE-Tag: food22_3e0cd7127130 X-Filterd-Recvd-Size: 2886 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Sat, 19 Sep 2020 04:20:19 +0000 (UTC) Received: from localhost.localdomain (c-71-198-47-131.hsd1.ca.comcast.net [71.198.47.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 07C4521D43; Sat, 19 Sep 2020 04:20:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600489219; bh=Ied6UXpKS0iFDC4luEi/Lv6jAp7WaTwNcN566z1NQHw=; h=Date:From:To:Subject:In-Reply-To:From; b=S6ST7Kl1fgDGwPJTq/AZ0PeWkgJmDPi8LlD0HgfO6j43eCCi82affDAcUdb6N8aiJ MekGOKRLTlpEH6GvKiVcNcahtWTOZhTa3Exq3lsj7cXb5reVZK5kkAiJ+QcPsRppPY qBIXnnnmpFtvZVS79rqAr3KmeGs2U75aN3+ANuMU= Date: Fri, 18 Sep 2020 21:20:18 -0700 From: Andrew Morton To: akpm@linux-foundation.org, chris@chrisdown.name, gandalf@winds.org, hughd@google.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, torvalds@linux-foundation.org Subject: [patch 07/15] tmpfs: restore functionality of nr_inodes=0 Message-ID: <20200919042018.EijFHCeuD%akpm@linux-foundation.org> In-Reply-To: <20200918211925.7e97f0ef63d92f5cfe5ccbc5@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Byron Stanoszek Subject: tmpfs: restore functionality of nr_inodes=0 Commit e809d5f0b5c9 ("tmpfs: per-superblock i_ino support") made changes to shmem_reserve_inode() in mm/shmem.c, however the original test for (sbinfo->max_inodes) got dropped. This causes mounting tmpfs with option nr_inodes=0 to fail: # mount -ttmpfs -onr_inodes=0 none /ext0 mount: /ext0: mount(2) system call failed: Cannot allocate memory. This patch restores the nr_inodes=0 functionality. Link: https://lkml.kernel.org/r/20200902035715.16414-1-gandalf@winds.org Fixes: e809d5f0b5c9 ("tmpfs: per-superblock i_ino support") Signed-off-by: Byron Stanoszek Acked-by: Hugh Dickins Acked-by: Chris Down Signed-off-by: Andrew Morton --- mm/shmem.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) --- a/mm/shmem.c~tmpfs-restore-functionality-of-nr_inodes=0 +++ a/mm/shmem.c @@ -279,11 +279,13 @@ static int shmem_reserve_inode(struct su if (!(sb->s_flags & SB_KERNMOUNT)) { spin_lock(&sbinfo->stat_lock); - if (!sbinfo->free_inodes) { - spin_unlock(&sbinfo->stat_lock); - return -ENOSPC; + if (sbinfo->max_inodes) { + if (!sbinfo->free_inodes) { + spin_unlock(&sbinfo->stat_lock); + return -ENOSPC; + } + sbinfo->free_inodes--; } - sbinfo->free_inodes--; if (inop) { ino = sbinfo->next_ino++; if (unlikely(is_zero_ino(ino)))