|
 |
8280d7e |
--- nfs-utils-1.0.9/utils/mount/nfs4mount.c.orig 2006-07-07 20:04:32.000000000 -0400
|
|
|
8280d7e |
+++ nfs-utils-1.0.9/utils/mount/nfs4mount.c 2006-07-28 13:08:10.000000000 -0400
|
|
|
8280d7e |
@@ -200,7 +200,7 @@ int nfs4mount(const char *spec, const ch
|
|
|
8280d7e |
char *s;
|
|
|
8280d7e |
int val;
|
|
|
8280d7e |
int bg, soft, intr;
|
|
|
8280d7e |
- int nocto, noac;
|
|
|
8280d7e |
+ int nocto, noac, fscache;
|
|
|
8280d7e |
int retry;
|
|
|
8280d7e |
int retval;
|
|
|
8280d7e |
time_t timeout, t;
|
|
|
8280d7e |
@@ -251,6 +251,7 @@ int nfs4mount(const char *spec, const ch
|
|
|
8280d7e |
intr = NFS4_MOUNT_INTR;
|
|
|
8280d7e |
nocto = 0;
|
|
|
8280d7e |
noac = 0;
|
|
|
8280d7e |
+ fscache = 0;
|
|
|
8280d7e |
retry = 10000; /* 10000 minutes ~ 1 week */
|
|
|
8280d7e |
|
|
|
8280d7e |
/*
|
|
|
8280d7e |
@@ -331,6 +332,8 @@ int nfs4mount(const char *spec, const ch
|
|
|
8280d7e |
soft = !val;
|
|
|
8280d7e |
else if (!strcmp(opt, "intr"))
|
|
|
8280d7e |
intr = val;
|
|
|
8280d7e |
+ else if (!strcmp(opt, "fsc"))
|
|
|
8280d7e |
+ fscache = val;
|
|
|
8280d7e |
else if (!strcmp(opt, "cto"))
|
|
|
8280d7e |
nocto = !val;
|
|
|
8280d7e |
else if (!strcmp(opt, "ac"))
|
|
|
8280d7e |
@@ -346,7 +349,8 @@ int nfs4mount(const char *spec, const ch
|
|
|
8280d7e |
data.flags = (soft ? NFS4_MOUNT_SOFT : 0)
|
|
|
8280d7e |
| (intr ? NFS4_MOUNT_INTR : 0)
|
|
|
8280d7e |
| (nocto ? NFS4_MOUNT_NOCTO : 0)
|
|
|
8280d7e |
- | (noac ? NFS4_MOUNT_NOAC : 0);
|
|
|
8280d7e |
+ | (noac ? NFS4_MOUNT_NOAC : 0)
|
|
|
8280d7e |
+ | (fscache ? NFS4_MOUNT_FSCACHE : 0);
|
|
|
8280d7e |
|
|
|
8280d7e |
/*
|
|
|
8280d7e |
* Give a warning if the rpc.idmapd daemon is not running
|
|
|
8280d7e |
--- nfs-utils-1.0.9/utils/mount/nfs_mount.h.orig 2006-07-28 12:52:43.000000000 -0400
|
|
|
8280d7e |
+++ nfs-utils-1.0.9/utils/mount/nfs_mount.h 2006-07-28 12:58:07.000000000 -0400
|
|
|
8280d7e |
@@ -63,6 +63,7 @@ struct nfs_mount_data {
|
|
|
8280d7e |
#define NFS_MOUNT_BROKEN_SUID 0x0400 /* 4 */
|
|
|
8280d7e |
#define NFS_MOUNT_NOACL 0x0800 /* 4 */
|
|
|
8280d7e |
#define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
|
|
|
8280d7e |
+#define NFS_MOUNT_FSCACHE 0x4000 /* 6 */
|
|
|
8280d7e |
|
|
|
8280d7e |
/* security pseudoflavors */
|
|
|
8280d7e |
|
|
|
8280d7e |
--- nfs-utils-1.0.9/utils/mount/nfsmount.c.orig 2006-07-28 13:02:55.000000000 -0400
|
|
|
8280d7e |
+++ nfs-utils-1.0.9/utils/mount/nfsmount.c 2006-07-28 13:03:11.000000000 -0400
|
|
|
8280d7e |
@@ -694,6 +694,10 @@ parse_options(char *old_opts, struct nfs
|
|
|
8280d7e |
data->flags &= ~NFS_MOUNT_SOFT;
|
|
|
8280d7e |
if (val)
|
|
|
8280d7e |
data->flags |= NFS_MOUNT_SOFT;
|
|
|
8280d7e |
+ } else if (!strcmp(opt, "fsc")) {
|
|
|
8280d7e |
+ data->flags &= ~NFS_MOUNT_FSCACHE;
|
|
|
8280d7e |
+ if (val)
|
|
|
8280d7e |
+ data->flags |= NFS_MOUNT_FSCACHE;
|
|
|
8280d7e |
} else if (!strcmp(opt, "hard")) {
|
|
|
8280d7e |
data->flags &= ~NFS_MOUNT_SOFT;
|
|
|
8280d7e |
if (!val)
|
|
|
8280d7e |
--- nfs-utils-1.0.9/utils/mount/nfs4_mount.h.orig 2006-07-07 20:04:32.000000000 -0400
|
|
|
8280d7e |
+++ nfs-utils-1.0.9/utils/mount/nfs4_mount.h 2006-07-28 13:07:27.000000000 -0400
|
|
|
8280d7e |
@@ -65,6 +65,7 @@ struct nfs4_mount_data {
|
|
|
8280d7e |
#define NFS4_MOUNT_NOCTO 0x0010 /* 1 */
|
|
|
8280d7e |
#define NFS4_MOUNT_NOAC 0x0020 /* 1 */
|
|
|
8280d7e |
#define NFS4_MOUNT_STRICTLOCK 0x1000 /* 1 */
|
|
|
8280d7e |
+#define NFS4_MOUNT_FSCACHE 0x4000 /* 1 */
|
|
|
8280d7e |
#define NFS4_MOUNT_FLAGMASK 0xFFFF
|
|
|
8280d7e |
|
|
|
8280d7e |
/* pseudoflavors: */
|