patch-2.3.51 linux/fs/nfsd/export.c

Next file: linux/fs/nfsd/lockd.c
Previous file: linux/fs/nfs/inode.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.50/linux/fs/nfsd/export.c linux/fs/nfsd/export.c
@@ -66,8 +66,6 @@
 static int			hash_count = 0;
 static DECLARE_WAIT_QUEUE_HEAD(	hash_wait );
 
-#define READLOCK		0
-#define WRITELOCK		1
 
 /*
  * Find a client's export for a device.
@@ -435,7 +433,7 @@
  */
 int
 exp_rootfh(struct svc_client *clp, kdev_t dev, ino_t ino,
-	   char *path, struct knfs_fh *f)
+	   char *path, struct knfsd_fh *f, int maxsize)
 {
 	struct svc_export	*exp;
 	struct dentry		*dentry = NULL;
@@ -484,11 +482,11 @@
 	/*
 	 * fh must be initialized before calling fh_compose
 	 */
-	fh_init(&fh);
-	fh_compose(&fh, exp, dentry);
-	memcpy(f, &fh.fh_handle, sizeof(struct knfs_fh));
+	fh_init(&fh, maxsize);
+	err = fh_compose(&fh, exp, dentry);
+	memcpy(f, &fh.fh_handle, sizeof(struct knfsd_fh));
 	fh_put(&fh);
-	return 0;
+	return err;
 
 out:
 	dput(dentry);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)