rpms/util-linux/devel util-linux-2.13-pre6-nfsmount-fsc.patch, NONE, 1.1.2.1 util-linux.spec, 1.106, 1.106.2.1
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Feb 17 12:21:50 UTC 2006
Author: steved
Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15547
Modified Files:
Tag: private-util-linux-2_13-pre6-nfsmount_fsc
util-linux.spec
Added Files:
Tag: private-util-linux-2_13-pre6-nfsmount_fsc
util-linux-2.13-pre6-nfsmount-fsc.patch
Log Message:
Added 'fsc' mount option to turn on Filesystem caching for both
nfs and nfs4
util-linux-2.13-pre6-nfsmount-fsc.patch:
nfs.5 | 6 ++++++
nfs4_mount.h | 1 +
nfs4mount.c | 10 +++++++---
nfs_mount4.h | 1 +
nfsmount.c | 4 ++++
5 files changed, 19 insertions(+), 3 deletions(-)
--- NEW FILE util-linux-2.13-pre6-nfsmount-fsc.patch ---
--- util-linux-2.13-pre6/mount/nfs_mount4.h.fsc 2006-02-17 06:19:51.000000000 -0500
+++ util-linux-2.13-pre6/mount/nfs_mount4.h 2006-02-17 06:23:25.000000000 -0500
@@ -57,6 +57,7 @@ struct nfs_mount_data {
#define NFS_MOUNT_NONLM 0x0200 /* 3 */
#define NFS_MOUNT_BROKEN_SUID 0x0400 /* 4 */
#define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
+#define NFS_MOUNT_FSCACHE 0x4000
/* security pseudoflavors */
--- util-linux-2.13-pre6/mount/nfsmount.c.fsc 2006-02-17 06:19:51.000000000 -0500
+++ util-linux-2.13-pre6/mount/nfsmount.c 2006-02-17 06:23:25.000000000 -0500
@@ -836,6 +836,10 @@ parse_options(char *old_opts, struct nfs
data->flags &= ~NFS_MOUNT_SOFT;
if (val)
data->flags |= NFS_MOUNT_SOFT;
+ } else if (!strcmp(opt, "fsc")) {
+ data->flags &= ~NFS_MOUNT_FSCACHE;
+ if (val)
+ data->flags |= NFS_MOUNT_FSCACHE;
} else if (!strcmp(opt, "hard")) {
data->flags &= ~NFS_MOUNT_SOFT;
if (!val)
--- util-linux-2.13-pre6/mount/nfs4mount.c.fsc 2006-02-17 06:19:51.000000000 -0500
+++ util-linux-2.13-pre6/mount/nfs4mount.c 2006-02-17 06:23:25.000000000 -0500
@@ -77,7 +77,7 @@ char *GSSDLCK = DEFAULT_DIR "/rpcgssd";
#endif
extern int clnt_ping(struct sockaddr_in *, const u_long, const u_long, const u_int);
-extern void rpc_strerror();
+extern void rpc_strerror(void);
struct {
char *flavour;
@@ -208,7 +208,7 @@ int nfs4mount(const char *spec, const ch
char *s;
int val;
int bg, soft, intr;
- int nocto, noac;
+ int nocto, noac, fscache;
int retry;
int retval;
@@ -258,6 +258,7 @@ int nfs4mount(const char *spec, const ch
intr = NFS4_MOUNT_INTR;
nocto = 0;
noac = 0;
+ fscache = 0;
retry = 10000; /* 10000 minutes ~ 1 week */
/*
@@ -337,6 +338,8 @@ int nfs4mount(const char *spec, const ch
soft = !val;
else if (!strcmp(opt, "intr"))
intr = val;
+ else if (!strcmp(opt, "fsc"))
+ fscache = val;
else if (!strcmp(opt, "cto"))
nocto = !val;
else if (!strcmp(opt, "ac"))
@@ -354,7 +357,8 @@ int nfs4mount(const char *spec, const ch
data.flags = (soft ? NFS4_MOUNT_SOFT : 0)
| (intr ? NFS4_MOUNT_INTR : 0)
| (nocto ? NFS4_MOUNT_NOCTO : 0)
- | (noac ? NFS4_MOUNT_NOAC : 0);
+ | (noac ? NFS4_MOUNT_NOAC : 0)
+ | (fscache ? NFS4_MOUNT_FSCACHE : 0);
/*
* Give a warning if the rpc.idmapd daemon is not running
--- util-linux-2.13-pre6/mount/nfs4_mount.h.fsc 2006-02-17 06:19:51.000000000 -0500
+++ util-linux-2.13-pre6/mount/nfs4_mount.h 2006-02-17 06:23:25.000000000 -0500
@@ -65,6 +65,7 @@ struct nfs4_mount_data {
#define NFS4_MOUNT_NOCTO 0x0010 /* 1 */
#define NFS4_MOUNT_NOAC 0x0020 /* 1 */
#define NFS4_MOUNT_STRICTLOCK 0x1000 /* 1 */
+#define NFS4_MOUNT_FSCACHE 0x2000 /* 1 */
#define NFS4_MOUNT_FLAGMASK 0xFFFF
/* pseudoflavors: */
--- util-linux-2.13-pre6/mount/nfs.5.fsc 2006-02-17 06:19:52.000000000 -0500
+++ util-linux-2.13-pre6/mount/nfs.5 2006-02-17 06:36:09.000000000 -0500
@@ -267,6 +267,9 @@ default UDP protocol. Many NFS servers
.I udp
Mount the NFS filesystem using the UDP protocol. This
is the default.
+.TP 1.5i
+.I fsc
+Make use of Filesystem Caching, if available.
.P
All of the non-value options have corresponding nooption forms.
For example, nointr means don't allow file operations to be
@@ -421,6 +424,9 @@ This extracts a
server performance penalty but it allows two different NFS clients
to get reasonable good results when both clients are actively
writing to common filesystem on the server.
+.TP 1.5i
+.I fsc
+Make use of Filesystem Caching, if available.
.P
All of the non-value options have corresponding nooption forms.
For example, nointr means don't allow file operations to be
Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.106
retrieving revision 1.106.2.1
diff -u -r1.106 -r1.106.2.1
--- util-linux.spec 11 Feb 2006 05:56:30 -0000 1.106
+++ util-linux.spec 17 Feb 2006 12:21:46 -0000 1.106.2.1
@@ -25,7 +25,7 @@
Summary: A collection of basic system utilities.
Name: util-linux
Version: 2.13
-Release: 0.15.1
+Release: 0.15.1.fsc
License: distributable
Group: System Environment/Base
@@ -109,6 +109,7 @@
Patch172: util-linux-2.12a-nfsmount-overflow.patch
Patch173: util-linux-2.12a-nfsmount-reservp.patch
Patch174: util-linux-2.12p-nfsmount-rollback.patch
+Patch175: util-linux-2.13-pre6-nfsmount-fsc.patch
# Makeing /var/log/lastlog (#151635)
Patch180: util-linux-2.12p-login-lastlog.patch
@@ -215,6 +216,7 @@
%patch172 -p1
%patch173 -p1
%patch174 -p1
+%patch175 -p1
%patch180 -p1
%patch181 -p1
%patch182 -p1
@@ -627,6 +629,10 @@
/sbin/losetup
%changelog
+* Fri Feb 17 2006 Steve Dickson <steved at redhat.com> - 2.13-0.15.1.fsc
+- Added 'fsc' mount option to turn on Filesystem caching for both
+ nfs and nfs4
+
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13-0.15.1
- bump again for double-long bug on ppc(64)
More information about the fedora-cvs-commits
mailing list