Re: Linux 2.2.16pre5 - NFS

From: Chip Salzenberg (chip@valinux.com)
Date: Sat May 27 2000 - 18:49:21 EST


According to Alan Cox:
> Ok Dave thinks its solid, some other testers do, Trond ? you happy
> if so then we'll give it a spin [...]

Great! In case you'd like to grab the patches before dave/trond/neil
can see your mail, there are three parts you should get and apply, in
this order.

  1. Trond's client patches.
     Current version is
 <http://www.fys.uio.no/~trondmy/src/linux-2.2.15-nfsv3-0.20.11.dif.bz2>
     It applies almost perfectly to 2.2.16pre5. There's one hunk that
     fails in fs/nfs/inode.c. I've appended a replacement hunk.

  2. Dave's merge of everything else -- v3 server, nlm4, etc.
     It's on SourceForge. Here's a URL for the tarball:
 <http://download.sourceforge.net/nfs/kernel-nfs-dhiggen_merge-2.0.gz>

  3. My tiny contribution: A cosmetic tweak to the configuration.
     I've appended it.

Here's the replacement hunk for Trond's patch with 2.2.16pre5.

---------------------------------------------------------------------
Index: fs/nfs/inode.c
@@ -438,16 +627,16 @@ restart:
 
 /*
- * Invalidate the local caches
+ * Zap the caches.
  */
-static void
+void
 nfs_zap_caches(struct inode *inode)
 {
         NFS_ATTRTIMEO(inode) = NFS_MINATTRTIMEO(inode);
- NFS_CACHEINV(inode);
+ NFS_ATTRTIMEO_UPDATE(inode) = jiffies;
 
- if (S_ISDIR(inode->i_mode))
- nfs_invalidate_dircache(inode);
- else
- invalidate_inode_pages(inode);
+ invalidate_inode_pages(inode);
+
+ memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode)));
+ NFS_CACHEINV(inode);
 }
 
---------------------------------------------------------------------

And here's my config tweak.

---------------------------------------------------------------------
Index: fs/Config.in
@@ -73,10 +73,13 @@
   tristate 'Coda filesystem support (advanced network fs)' CONFIG_CODA_FS
   tristate 'NFS filesystem support' CONFIG_NFS_FS
+ if [ "$CONFIG_NFS_FS" != "n" ]; then
+ bool ' NFS Version 3 filesystem support' CONFIG_NFS_V3
+ fi
   if [ "$CONFIG_NFS_FS" = "y" -a "$CONFIG_IP_PNP" = "y" ]; then
     bool ' Root file system on NFS' CONFIG_ROOT_NFS
   fi
   tristate 'NFS server support' CONFIG_NFSD
- if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- bool ' Provide NFSv3 server support (EXPERIMENTAL)' CONFIG_NFSD_V3
+ if [ "$CONFIG_NFSD" != "n" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then
+ bool ' NFS Version 3 server support (EXPERIMENTAL)' CONFIG_NFSD_V3
   fi
   if [ "$CONFIG_NFS_FS" = "y" -o "$CONFIG_NFSD" = "y" ]; then
@@ -91,7 +94,4 @@
       define_bool CONFIG_LOCKD n
     fi
- fi
- if [ "$CONFIG_NFS_FS" != "n" -o "$CONFIG_NFSD" != "n" ]; then
- bool ' NFS Version 3' CONFIG_NFS_V3
   fi
   tristate 'SMB filesystem support (to mount WfW shares etc.)' CONFIG_SMB_FS
---------------------------------------------------------------------

-- 
Chip Salzenberg              - a.k.a. -              <chip@valinux.com>
"I wanted to play hopscotch with the impenetrable mystery of existence,
    but he stepped in a wormhole and had to go in early."  // MST3K

- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Wed May 31 2000 - 21:00:18 EST