rpms/nfs-utils/FC-6 nfs-utils-1.0.10-mount-fsc.patch, NONE, 1.1 nfs-utils.spec, 1.132, 1.133 nfs-utils-1.0.9-mount-fsc.patch, 1.2, NONE

Wed Jul 25 14:44:19 UTC 2007

Author: steved

Update of /cvs/dist/rpms/nfs-utils/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv10894

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.0.10-mount-fsc.patch 
Removed Files:
	nfs-utils-1.0.9-mount-fsc.patch 
Log Message:
Re-enabled the fsc mount option.



nfs-utils-1.0.10-mount-fsc.patch:
 nfs.man      |    7 +++++++
 nfs4_mount.h |    3 ++-
 nfs4mount.c  |    8 ++++++--
 nfs_mount.h  |    1 +
 nfsmount.c   |    4 ++++
 5 files changed, 20 insertions(+), 3 deletions(-)

--- NEW FILE nfs-utils-1.0.10-mount-fsc.patch ---
--- nfs-utils-1.0.10/utils/mount/nfsmount.c.orig	2007-07-25 10:30:08.000000000 -0400
+++ nfs-utils-1.0.10/utils/mount/nfsmount.c	2007-07-25 10:31:09.000000000 -0400
@@ -695,6 +695,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)
--- nfs-utils-1.0.10/utils/mount/nfs.man.orig	2007-07-25 10:30:08.000000000 -0400
+++ nfs-utils-1.0.10/utils/mount/nfs.man	2007-07-25 10:37:52.000000000 -0400
@@ -303,6 +303,9 @@ Use of this option is not recommended un
 are no hard links or subtrees of this mountpoint that are mounted
 elsewhere.
 .TP 1.5i
+.I fsc
+Enable the use of persistent caching to the local disk using
+the FS-Cache facility for the given mount point.
 .P
 All of the non-value options have corresponding nooption forms.
 For example, nointr means don't allow file operations to be
@@ -476,6 +479,10 @@ options.
 Use of this option is not recommended unless you are certain that there
 are no hard links or subtrees of this mountpoint that are mounted
 elsewhere.
+.TP 1.5i
+.I fsc
+Enable the use of persistent caching to the local disk using
+the FS-Cache facility for the given mount point.
 .P
 All of the non-value options have corresponding nooption forms.
 For example, nointr means don't allow file operations to be
--- nfs-utils-1.0.10/utils/mount/nfs4mount.c.orig	2007-07-25 10:30:08.000000000 -0400
+++ nfs-utils-1.0.10/utils/mount/nfs4mount.c	2007-07-25 10:33:19.000000000 -0400
@@ -201,7 +201,7 @@ int nfs4mount(const char *spec, const ch
 	char *s;
 	int val;
 	int bg, soft, intr;
-	int nocto, noac, unshared;
+	int nocto, noac, unshared, fscache;
 	int retry;
 	int retval;
 	time_t timeout, t;
@@ -254,6 +254,7 @@ int nfs4mount(const char *spec, const ch
 	noac = 0;
 	unshared = 0;
 	retry = 10000;		/* 10000 minutes ~ 1 week */
+	fscache = 0;
 
 	/*
 	 * NFSv4 specifies that the default port should be 2049
@@ -333,6 +334,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"))
@@ -351,7 +354,8 @@ int nfs4mount(const char *spec, const ch
 		| (intr ? NFS4_MOUNT_INTR : 0)
 		| (nocto ? NFS4_MOUNT_NOCTO : 0)
 		| (noac ? NFS4_MOUNT_NOAC : 0)
-		| (unshared ? NFS4_MOUNT_UNSHARED : 0);
+		| (unshared ? NFS4_MOUNT_UNSHARED : 0)
+		| (fscache ? NFS4_MOUNT_FSCACHE : 0);
 
 	/*
 	 * Give a warning if the rpc.idmapd daemon is not running
--- nfs-utils-1.0.10/utils/mount/nfs4_mount.h.orig	2007-07-25 10:30:08.000000000 -0400
+++ nfs-utils-1.0.10/utils/mount/nfs4_mount.h	2007-07-25 10:35:38.000000000 -0400
@@ -66,7 +66,8 @@ struct nfs4_mount_data {
 #define NFS4_MOUNT_NOAC		0x0020	/* 1 */
 #define NFS4_MOUNT_STRICTLOCK	0x1000	/* 1 */
 #define NFS4_MOUNT_UNSHARED	0x8000	/* 1 */
-#define NFS4_MOUNT_FLAGMASK	0xFFFF
+#define NFS4_MOUNT_FSCACHE  0x10000 /* 5 */
+#define NFS4_MOUNT_FLAGMASK	0x1FFFF
 
 /* pseudoflavors: */
 
--- nfs-utils-1.0.10/utils/mount/nfs_mount.h.orig	2007-07-25 10:30:08.000000000 -0400
+++ nfs-utils-1.0.10/utils/mount/nfs_mount.h	2007-07-25 10:34:43.000000000 -0400
@@ -65,6 +65,7 @@ struct nfs_mount_data {
 #define NFS_MOUNT_SECFLAVOUR	0x2000	/* 5 */
 #define NFS_MOUNT_NORDIRPLUS	0x4000	/* 5 */
 #define NFS_MOUNT_UNSHARED		0x8000	/* 5 */
+#define NFS_MOUNT_FSCACHE		0x10000 /* 5 */
 
 /* security pseudoflavors */
 


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/FC-6/nfs-utils.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- nfs-utils.spec	11 Jul 2007 21:24:09 -0000	1.132
+++ nfs-utils.spec	25 Jul 2007 14:44:17 -0000	1.133
@@ -1,7 +1,7 @@
 Summary: NFS utlilities and supporting clients and daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.10
-Release: 14%{?dist}
+Release: 15%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -14,7 +14,7 @@
 
 # Enable the ability to set the 'fsc' mount flag which
 # will allow NFS to use FS-Cache.
-%define enablefscache 0
+%define enablefscache 1
 
 Source0: http://www.kernel.org/pub/linux/utils/nfs/nfs-utils-1.0.10.tar.bz2
 Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz
@@ -63,7 +63,7 @@
 
 
 %if %{enablefscache}
-Patch900: nfs-utils-1.0.9-mount-fsc.patch
+Patch900: nfs-utils-1.0.10-mount-fsc.patch
 %endif
 
 %endif
@@ -328,6 +328,9 @@
 %endif
 
 %changelog
+* Wed Jul 25 2007 Steve Dickson <steved at redhat.com> 1.0.10-15
+- Re-enabled the fsc mount option.
+
 * Wed Jul 11 2007 Steve Dickson <steved at redhat.com> 1.0.10-14
 - Added nosharecache mount option which re-enables
   rw/ro mounts to the same server (bz 207670).


--- nfs-utils-1.0.9-mount-fsc.patch DELETED ---


