nfs-utils-mount-fsc.patch

   1 --- nfs-utils-1.0.9/utils/mount/nfs4mount.c.orig        2006-10-16 08:32:53.789617000 -0400
   2 +++ nfs-utils-1.0.9/utils/mount/nfs4mount.c     2006-10-16 08:33:53.098133000 -0400
   3 @@ -201,7 +201,7 @@ int nfs4mount(const char *spec, const ch
   4         char *s;
   5         int val;
   6         int bg, soft, intr;
   7 -       int nocto, noac;
   8 +       int nocto, noac, fscache;
   9         int retry;
  10         int retval;
  11         time_t timeout, t;
  12 @@ -252,6 +252,7 @@ int nfs4mount(const char *spec, const ch
  13         intr = NFS4_MOUNT_INTR;
  14         nocto = 0;
  15         noac = 0;
  16 +       fscache = 0;
  17         retry = 10000;          /* 10000 minutes ~ 1 week */
  18
  19         /*
  20 @@ -332,6 +333,8 @@ int nfs4mount(const char *spec, const ch
  21                                 soft = !val;
  22                         else if (!strcmp(opt, "intr"))
  23                                 intr = val;
  24 +                       else if (!strcmp(opt, "fsc"))
  25 +                               fscache = val;
  26                         else if (!strcmp(opt, "cto"))
  27                                 nocto = !val;
  28                         else if (!strcmp(opt, "ac"))
  29 @@ -347,7 +350,8 @@ int nfs4mount(const char *spec, const ch
  30         data.flags = (soft ? NFS4_MOUNT_SOFT : 0)
  31                 | (intr ? NFS4_MOUNT_INTR : 0)
  32                 | (nocto ? NFS4_MOUNT_NOCTO : 0)
  33 -               | (noac ? NFS4_MOUNT_NOAC : 0);
  34 +               | (noac ? NFS4_MOUNT_NOAC : 0)
  35 +               | (fscache ? NFS4_MOUNT_FSCACHE : 0);
  36
  37         /*
  38          * Give a warning if the rpc.idmapd daemon is not running
  39 --- nfs-utils-1.0.9/utils/mount/nfs_mount.h.orig        2006-10-16 08:32:53.763643000 -0400
  40 +++ nfs-utils-1.0.9/utils/mount/nfs_mount.h     2006-10-16 08:33:53.113133000 -0400
  41 @@ -63,6 +63,7 @@ struct nfs_mount_data {
  42  #define NFS_MOUNT_BROKEN_SUID  0x0400  /* 4 */
  43  #define NFS_MOUNT_NOACL     0x0800  /* 4 */
  44  #define NFS_MOUNT_SECFLAVOUR   0x2000  /* 5 */
  45 +#define NFS_MOUNT_FSCACHE      0x4000  /* 6 */
  46
  47  /* security pseudoflavors */
  48
  49 --- nfs-utils-1.0.9/utils/mount/nfsmount.c.orig 2006-10-16 08:32:53.853553000 -0400
  50 +++ nfs-utils-1.0.9/utils/mount/nfsmount.c      2006-10-16 08:33:53.128133000 -0400
  51 @@ -695,6 +695,10 @@ parse_options(char *old_opts, struct nfs
  52                                 data->flags &= ~NFS_MOUNT_SOFT;
  53                                 if (val)
  54                                         data->flags |= NFS_MOUNT_SOFT;
  55 +                       } else if (!strcmp(opt, "fsc")) {
  56 +                               data->flags &= ~NFS_MOUNT_FSCACHE;
  57 +                               if (val)
  58 +                                       data->flags |= NFS_MOUNT_FSCACHE;
  59                         } else if (!strcmp(opt, "hard")) {
  60                                 data->flags &= ~NFS_MOUNT_SOFT;
  61                                 if (!val)
  62 --- nfs-utils-1.0.9/utils/mount/nfs4_mount.h.orig       2006-07-07 20:04:32.000000000 -0400
  63 +++ nfs-utils-1.0.9/utils/mount/nfs4_mount.h    2006-10-16 08:33:53.143133000 -0400
  64 @@ -65,6 +65,7 @@ struct nfs4_mount_data {
  65  #define NFS4_MOUNT_NOCTO       0x0010  /* 1 */
  66  #define NFS4_MOUNT_NOAC                0x0020  /* 1 */
  67  #define NFS4_MOUNT_STRICTLOCK  0x1000  /* 1 */
  68 +#define NFS4_MOUNT_FSCACHE     0x4000  /* 1 */
  69  #define NFS4_MOUNT_FLAGMASK    0xFFFF
  70
  71  /* pseudoflavors: */
  72 --- nfs-utils-1.0.9/utils/mount/nfs.man.orig    2006-10-16 08:32:53.825581000 -0400
  73 +++ nfs-utils-1.0.9/utils/mount/nfs.man 2006-10-16 08:36:39.503163000 -0400
  74 @@ -272,6 +272,10 @@ default UDP protocol.  Many NFS servers
  75  .I udp
  76  Mount the NFS filesystem using the UDP protocol.  This
  77  is the default.
  78 +.TP 1.5i
  79 +.I fsc
  80 +Enable the use of persistent caching to the local disk using
  81 +the FS-Cache facility for the given mount point.
  82  .P
  83  All of the non-value options have corresponding nooption forms.
  84  For example, nointr means don't allow file operations to be
  85 @@ -428,6 +432,10 @@ This extracts a
  86  server performance penalty but it allows two different NFS clients
  87  to get reasonable good results when both clients are actively
  88  writing to common filesystem on the server.
  89 +.TP 1.5i
  90 +.I fsc
  91 +Enable the use of persistent caching to the local disk using
  92 +the FS-Cache facility for the given mount point.
  93  .P
  94  All of the non-value options have corresponding nooption forms.
  95  For example, nointr means don't allow file operations to be