From patchwork Wed Sep 2 03:57:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Byron Stanoszek X-Patchwork-Id: 11749823 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 BC71614E3 for ; Wed, 2 Sep 2020 03:58:24 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7FD79207EA for ; Wed, 2 Sep 2020 03:58:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7FD79207EA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=winds.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 90BCF6B0003; Tue, 1 Sep 2020 23:58:23 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 895AF6B005A; Tue, 1 Sep 2020 23:58:23 -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 735686B005C; Tue, 1 Sep 2020 23:58:23 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0120.hostedemail.com [216.40.44.120]) by kanga.kvack.org (Postfix) with ESMTP id 5A46F6B0003 for ; Tue, 1 Sep 2020 23:58:23 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id F2E27824934B for ; Wed, 2 Sep 2020 03:58:22 +0000 (UTC) X-FDA: 77216764086.17.laugh03_3d186092709d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id BED6B180D0180 for ; Wed, 2 Sep 2020 03:58:22 +0000 (UTC) X-Spam-Summary: 1,0,0,3e2bee263bdf2412,d41d8cd98f00b204,root@winds.org,,RULES_HIT:41:355:379:541:800:960:966:973:988:989:1260:1311:1314:1345:1437:1515:1534:1541:1711:1730:1747:1777:1792:2196:2198:2199:2200:2393:2559:2562:3138:3139:3140:3141:3142:3352:3865:3867:3870:4385:5007:6261:8660:10004:11026:11658:11914:12043:12048:12296:12297:12555:12679:12895:13069:13148:13230:13311:13357:13894:14096:14130:14181:14384:14394:14721:21080:21451:21627:21939:21990:30054:30069,0,RBL:68.75.195.9:@winds.org:.lbl8.mailshell.net-64.201.201.201 62.14.0.100;04yrt5d8w6tsifz6mxhbsyqc1539iopm8ka48m7fbmjik8diht951jdch8c5u8q.613exst668nya3fmg58eqxmtn1dihhh9sjmxwmfaqcnpiimfc4erg5adc4p6njb.y-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,LFtime:25,LUA_SUMMARY:none X-HE-Tag: laugh03_3d186092709d X-Filterd-Recvd-Size: 2090 Received: from winds.org (winds.org [68.75.195.9]) by imf24.hostedemail.com (Postfix) with ESMTP for ; Wed, 2 Sep 2020 03:58:22 +0000 (UTC) Received: by winds.org (Postfix, from userid 0) id 4775C13BC8FD; Tue, 1 Sep 2020 23:58:21 -0400 (EDT) From: Byron Stanoszek To: Hugh Dickins , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Byron Stanoszek , Chris Down Subject: [PATCH] tmpfs: Restore functionality of nr_inodes=0 Date: Tue, 1 Sep 2020 23:57:15 -0400 Message-Id: <20200902035715.16414-1-gandalf@winds.org> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-Rspamd-Queue-Id: BED6B180D0180 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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: 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. Fixes: e809d5f0b5c9 ("tmpfs: per-superblock i_ino support") Cc: Chris Down Signed-off-by: Byron Stanoszek Acked-by: Hugh Dickins Acked-by: Chris Down --- mm/shmem.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 271548ca20f3..8e2b35ba93ad 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -279,11 +279,13 @@ static int shmem_reserve_inode(struct super_block *sb, ino_t *inop) 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)))