From patchwork Mon Oct 28 12:43:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masatake YAMATO X-Patchwork-Id: 11215381 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 566F013B1 for ; Mon, 28 Oct 2019 12:44:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2B0BE20578 for ; Mon, 28 Oct 2019 12:44:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="d64zmDN+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727870AbfJ1MoO (ORCPT ); Mon, 28 Oct 2019 08:44:14 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:26390 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727308AbfJ1MoN (ORCPT ); Mon, 28 Oct 2019 08:44:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1572266652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UoJnlVL6iUFYAedpqgcBRuvzbcqQJ5OMnOvE+mu68sc=; b=d64zmDN+KVbYO4UqMO8wP099WlEXVq0TnvVdXHlQsljio+ZTk7iz0JkhS2uajtfBbJ3x6L 4R2WLwn6W68QXdp+CJhQNqHJHf7zI5fY0bnnaH6wSLuW/6xNCsX9vzig6pPuAXdNIqmZuQ tsDaKzlMW5IPlMwJJAH7lSwEevEyYJ4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-191-UAhg-iBUPwqcA4PEh8pO3A-1; Mon, 28 Oct 2019 08:44:10 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EC91D867455 for ; Mon, 28 Oct 2019 12:44:09 +0000 (UTC) Received: from slave.localdomain.com (unknown [10.64.193.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2C26553D3; Mon, 28 Oct 2019 12:44:08 +0000 (UTC) From: Masatake YAMATO To: selinux@vger.kernel.org Cc: yamato@redhat.com Subject: [PATCH 1/2] docs: sysctl: update description for inode-state Date: Mon, 28 Oct 2019 21:43:52 +0900 Message-Id: <20191028124353.25276-1-yamato@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MC-Unique: UAhg-iBUPwqcA4PEh8pO3A-1 X-Mimecast-Spam-Score: 0 Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org The third field of inode-state is dummy (== 0). Update the description about the actual fields and dummies. Signed-off-by: Masatake YAMATO --- Documentation/admin-guide/sysctl/fs.rst | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Documentation/admin-guide/sysctl/fs.rst b/Documentation/admin-guide/sysctl/fs.rst index 2a45119e3331..596f84a1748d 100644 --- a/Documentation/admin-guide/sysctl/fs.rst +++ b/Documentation/admin-guide/sysctl/fs.rst @@ -151,18 +151,15 @@ out of inodes, you need to increase this value. The file inode-nr contains the first two items from inode-state, so we'll skip to that file... -Inode-state contains three actual numbers and four dummies. -The actual numbers are, in order of appearance, nr_inodes, -nr_free_inodes and preshrink. +Inode-state contains two actual numbers and five dummies. +The actual numbers are, in order of appearance, nr_inodes +and nr_free_inodes. Nr_inodes stands for the number of inodes the system has allocated, this can be slightly more than inode-max because Linux allocates them one pageful at a time. -Nr_free_inodes represents the number of free inodes (?) and -preshrink is nonzero when the nr_inodes > inode-max and the -system needs to prune the inode list instead of allocating -more. +Nr_free_inodes represents the number of free inodes. overflowgid & overflowuid From patchwork Mon Oct 28 12:43:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masatake YAMATO X-Patchwork-Id: 11215403 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 672D3112C for ; Mon, 28 Oct 2019 12:44:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 45D85214D9 for ; Mon, 28 Oct 2019 12:44:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="QTkgontG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389544AbfJ1MoX (ORCPT ); Mon, 28 Oct 2019 08:44:23 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:25474 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727308AbfJ1MoW (ORCPT ); Mon, 28 Oct 2019 08:44:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1572266661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R0Q7AIh4fXeUIo8N1ZgebBUMzEXLld5IiUHisAWSmb0=; b=QTkgontGuUJy6ii8XFc5tfD7nauQZfXlG6R4ijNdljQlCOsV36LkRrkcc0/5eBleth4sqr 09RxXcO24UUSMAeN4kFYan8clMk7lw/2V4s9sicvnCeleRaX0gXuyvPp+OJPAQU4BhMueY Fj5Pwz4rw16dTQOdlZ9KQjcM766iN9s= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-6-vFvHoGRZNEGEI2bQnpHsuQ-1; Mon, 28 Oct 2019 08:44:19 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 97CE9185A79B for ; Mon, 28 Oct 2019 12:44:19 +0000 (UTC) Received: from slave.localdomain.com (unknown [10.64.193.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA04F53D3; Mon, 28 Oct 2019 12:44:18 +0000 (UTC) From: Masatake YAMATO To: selinux@vger.kernel.org Cc: yamato@redhat.com Subject: [PATCH 2/2] docs: sysctl: delete the description about inode-max Date: Mon, 28 Oct 2019 21:43:53 +0900 Message-Id: <20191028124353.25276-2-yamato@redhat.com> In-Reply-To: <20191028124353.25276-1-yamato@redhat.com> References: <20191028124353.25276-1-yamato@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MC-Unique: vFvHoGRZNEGEI2bQnpHsuQ-1 X-Mimecast-Spam-Score: 0 Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org The code for inode-max was deleted long time ago (< Linux-2.6.12-rc2). Signed-off-by: Masatake YAMATO --- Documentation/admin-guide/sysctl/fs.rst | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Documentation/admin-guide/sysctl/fs.rst b/Documentation/admin-guide/sysctl/fs.rst index 596f84a1748d..5a99e37b5000 100644 --- a/Documentation/admin-guide/sysctl/fs.rst +++ b/Documentation/admin-guide/sysctl/fs.rst @@ -33,7 +33,6 @@ Currently, these files are in /proc/sys/fs: - dquot-nr - file-max - file-nr -- inode-max - inode-nr - inode-state - nr_open @@ -136,18 +135,12 @@ enough for most machines. Actual limit depends on RLIMIT_NOFILE resource limit. -inode-max, inode-nr & inode-state +inode-nr & inode-state --------------------------------- As with file handles, the kernel allocates the inode structures dynamically, but can't free them yet. -The value in inode-max denotes the maximum number of inode -handlers. This value should be 3-4 times larger than the value -in file-max, since stdin, stdout and network sockets also -need an inode struct to handle them. When you regularly run -out of inodes, you need to increase this value. - The file inode-nr contains the first two items from inode-state, so we'll skip to that file... @@ -156,8 +149,7 @@ The actual numbers are, in order of appearance, nr_inodes and nr_free_inodes. Nr_inodes stands for the number of inodes the system has -allocated, this can be slightly more than inode-max because -Linux allocates them one pageful at a time. +allocated. Nr_free_inodes represents the number of free inodes.