rpms/util-linux-ng/devel util-linux-ng-2.14-mount-man-tmpfs.patch, NONE, 1.1 util-linux-ng-2.14-mount-file_t.patch, 1.3, 1.4 util-linux-ng.spec, 1.32, 1.33
Karel Zak
kzak at fedoraproject.org
Mon Oct 6 11:21:32 UTC 2008
Author: kzak
Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29140
Modified Files:
util-linux-ng-2.14-mount-file_t.patch util-linux-ng.spec
Added Files:
util-linux-ng-2.14-mount-man-tmpfs.patch
Log Message:
* Mon Oct 6 2008 Karel Zak <kzak at redhat.com> 2.14.1-3
- fix #465761 - mount manpage is missing uid/gid mount options for tmpfs
- refresh util-linux-ng-2.14-mount-file_t.patch (fuzz=0)
util-linux-ng-2.14-mount-man-tmpfs.patch:
--- NEW FILE util-linux-ng-2.14-mount-man-tmpfs.patch ---
>From b9f2b3de43c820a4259ec8855359a2d8d18abe01 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak at redhat.com>
Date: Mon, 6 Oct 2008 12:56:37 +0200
Subject: [PATCH] mount: sync tmpfs info in mount.8 with Documentation/filesystems/tmpfs.txt
Addresses-Red-Hat-Bugzilla: #465761
Signed-off-by: Karel Zak <kzak at redhat.com>
---
mount/mount.8 | 71 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 62 insertions(+), 9 deletions(-)
Index: util-linux-ng-2.14.1/mount/mount.8
===================================================================
--- util-linux-ng-2.14.1.orig/mount/mount.8
+++ util-linux-ng-2.14.1/mount/mount.8
@@ -1607,26 +1607,79 @@ and the current version of
None.
.SH "Mount options for tmpfs"
-The following parameters accept a suffix
-.BR k ,
-.B m
-or
-.B g
-for Ki, Mi, Gi (binary kilo, mega and giga) and can be changed on remount.
.TP
.BI size= nbytes
Override default maximum size of the filesystem.
The size is given in bytes, and rounded down to entire pages.
-The default is half of the memory.
+The default is half of the memory. The size parameter also accepts a suffix %
+to limit this tmpfs instance to that percentage of your physical RAM:
+the default, when neither size nor nr_blocks is specified, is size=50%
.TP
.B nr_blocks=
-Set number of blocks.
+The same as size, but in blocks of PAGE_CACHE_SIZE
.TP
.B nr_inodes=
-Set number of inodes.
+The maximum number of inodes for this instance. The default
+is half of the number of your physical RAM pages, or (on a
+machine with highmem) the number of lowmem RAM pages,
+whichever is the lower.
+.PP
+The tmpfs mount options for sizing (
+.BR size ,
+.BR nr_blocks ,
+and
+.BR nr_inodes )
+accept a suffix
+.BR k ,
+.B m
+or
+.B g
+for Ki, Mi, Gi (binary kilo, mega and giga) and can be changed on remount.
+
.TP
.B mode=
Set initial permissions of the root directory.
+.TP
+.B uid=
+The user id.
+.TP
+.B gid=
+The group id.
+.TP
+.B mpol=[default|prefer:Node|bind:NodeList|interleave|interleave:NodeList]
+Set the NUMA memory allocation policy for all files in that
+instance (if the kernel CONFIG_NUMA is enabled) - which can be adjusted on the
+fly via 'mount -o remount ...'
+.RS
+.TP
+.B default
+prefers to allocate memory from the local node
+.TP
+.B prefer:Node
+prefers to allocate memory from the given Node
+.TP
+.B bind:NodeList
+allocates memory only from nodes in NodeList
+.TP
+.B interleave
+prefers to allocate from each node in turn
+.TP
+.B interleave:NodeList
+allocates from each node of NodeList in turn.
+.PP
+The NodeList format is a comma-separated list of decimal numbers and ranges, a
+range being two hyphen-separated decimal numbers, the smallest and largest node
+numbers in the range. For example, mpol=bind:0-3,5,7,9-15
+
+Note that trying to mount a tmpfs with an mpol option will fail if the
+running kernel does not support NUMA; and will fail if its nodelist
+specifies a node which is not online. If your system relies on that
+tmpfs being mounted, but from time to time runs a kernel built without
+NUMA capability (perhaps a safe recovery kernel), or with fewer nodes
+online, then it is advisable to omit the mpol option from automatic
+mount options. It can be added later, when the tmpfs is already mounted
+on MountPoint, by 'mount -o remount,mpol=Policy:NodeList MountPoint'.
+.PE
.SH "Mount options for udf"
udf is the "Universal Disk Format" filesystem defined by the Optical
util-linux-ng-2.14-mount-file_t.patch:
Index: util-linux-ng-2.14-mount-file_t.patch
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng-2.14-mount-file_t.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- util-linux-ng-2.14-mount-file_t.patch 14 Aug 2008 00:37:00 -0000 1.3
+++ util-linux-ng-2.14-mount-file_t.patch 6 Oct 2008 11:21:32 -0000 1.4
@@ -1,8 +1,8 @@
-Index: util-linux-ng-2.14.1-rc1/mount/mount.c
+Index: util-linux-ng-2.14.1/mount/mount.c
===================================================================
---- util-linux-ng-2.14.1-rc1.orig/mount/mount.c
-+++ util-linux-ng-2.14.1-rc1/mount/mount.c
-@@ -332,7 +332,7 @@ append_context(const char *optname, char
+--- util-linux-ng-2.14.1.orig/mount/mount.c
++++ util-linux-ng-2.14.1/mount/mount.c
+@@ -329,7 +329,7 @@ append_context(const char *optname, char
security_context_t raw = NULL;
char *data = NULL;
@@ -11,7 +11,7 @@
/* ignore the option if we running without selinux */
return 0;
-@@ -343,8 +343,8 @@ append_context(const char *optname, char
+@@ -340,8 +340,8 @@ append_context(const char *optname, char
data = *optdata =='"' ? strip_quotes(optdata) : optdata;
if (selinux_trans_to_raw_context(
@@ -22,7 +22,7 @@
return -1;
if (verbose)
-@@ -1397,6 +1397,27 @@ try_mount_one (const char *spec0, const
+@@ -1372,6 +1372,27 @@ try_mount_one (const char *spec0, const
res = EX_FAIL;
out:
Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- util-linux-ng.spec 10 Sep 2008 22:00:29 -0000 1.32
+++ util-linux-ng.spec 6 Oct 2008 11:21:32 -0000 1.33
@@ -2,7 +2,7 @@
Summary: A collection of basic system utilities
Name: util-linux-ng
Version: 2.14.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
Group: System Environment/Base
URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -99,6 +99,8 @@
Patch10: util-linux-ng-2.14-blockdev-rmpart.patch
# 390691: mount should check selinux context on mount, and warn on file_t
Patch11: util-linux-ng-2.14-mount-file_t.patch
+# 465761: mount manpage is missing uid/gid mount options for tmpfs (upstream patch)
+Patch12: util-linux-ng-2.14-mount-man-tmpfs.patch
%description
The util-linux-ng package contains a large variety of low-level system
@@ -121,6 +123,7 @@
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
%build
unset LINGUAS || :
@@ -513,6 +516,10 @@
/sbin/losetup
%changelog
+* Mon Oct 6 2008 Karel Zak <kzak at redhat.com> 2.14.1-3
+- fix #465761 - mount manpage is missing uid/gid mount options for tmpfs
+- refresh util-linux-ng-2.14-mount-file_t.patch (fuzz=0)
+
* Wed Sep 10 2008 Karel Zak <kzak at redhat.com> 2.14.1-2
- remove obsolete pam-console support
More information about the fedora-extras-commits
mailing list