X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fnfsd%2Fnfsctl.c;h=5014476b1d8717f8ee42305060917f719525dfaa;hb=1be35e94e1da3669db492995cd2c8b1a37016b11;hp=9c9399258afd06bf7ef26ac036a1c1014793dbe5;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 9c9399258..5014476b1 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -36,7 +36,7 @@
 #include <asm/uaccess.h>
 
 /*
- *	We have a single directory with 9 nodes in it.
+ *	We have a single directory with 8 nodes in it.
  */
 enum {
 	NFSD_Root = 1,
@@ -50,7 +50,6 @@ enum {
 	NFSD_List,
 	NFSD_Fh,
 	NFSD_Threads,
-	NFSD_Leasetime,
 };
 
 /*
@@ -65,7 +64,6 @@ static ssize_t write_getfd(struct file *file, char *buf, size_t size);
 static ssize_t write_getfs(struct file *file, char *buf, size_t size);
 static ssize_t write_filehandle(struct file *file, char *buf, size_t size);
 static ssize_t write_threads(struct file *file, char *buf, size_t size);
-static ssize_t write_leasetime(struct file *file, char *buf, size_t size);
 
 static ssize_t (*write_op[])(struct file *, char *, size_t) = {
 	[NFSD_Svc] = write_svc,
@@ -77,7 +75,6 @@ static ssize_t (*write_op[])(struct file *, char *, size_t) = {
 	[NFSD_Getfs] = write_getfs,
 	[NFSD_Fh] = write_filehandle,
 	[NFSD_Threads] = write_threads,
-	[NFSD_Leasetime] = write_leasetime,
 };
 
 /* an argresp is stored in an allocated page and holds the 
@@ -396,29 +393,6 @@ static ssize_t write_threads(struct file *file, char *buf, size_t size)
 	return strlen(buf);
 }
 
-extern time_t nfs4_leasetime(void);
-
-static ssize_t write_leasetime(struct file *file, char *buf, size_t size)
-{
-	/* if size > 10 seconds, call
-	 * nfs4_reset_lease() then write out the new lease (seconds) as reply
-	 */
-	char *mesg = buf;
-	int rv;
-
-	if (size > 0) {
-		int lease;
-		rv = get_int(&mesg, &lease);
-		if (rv)
-			return rv;
-		if (lease < 10 || lease > 3600)
-			return -EINVAL;
-		nfs4_reset_lease(lease);
-	}
-	sprintf(buf, "%ld\n", nfs4_lease_time());
-	return strlen(buf);
-}
-
 /*----------------------------------------------------------------------------*/
 /*
  *	populating the filesystem.
@@ -437,9 +411,6 @@ static int nfsd_fill_super(struct super_block * sb, void * data, int silent)
 		[NFSD_List] = {"exports", &exports_operations, S_IRUGO},
 		[NFSD_Fh] = {"filehandle", &transaction_ops, S_IWUSR|S_IRUSR},
 		[NFSD_Threads] = {"threads", &transaction_ops, S_IWUSR|S_IRUSR},
-#ifdef CONFIG_NFSD_V4
-		[NFSD_Leasetime] = {"nfsv4leasetime", &transaction_ops, S_IWUSR|S_IRUSR},
-#endif
 		/* last one */ {""}
 	};
 	return simple_fill_super(sb, 0x6e667364, nfsd_files);
@@ -470,7 +441,7 @@ static int __init init_nfsd(void)
 #ifdef CONFIG_NFSD_V4
 	nfsd_idmap_init();      /* Name to ID mapping */
 #endif /* CONFIG_NFSD_V4 */
-	if (proc_mkdir("fs/nfs", NULL)) {
+	if (proc_mkdir("fs/nfs", 0)) {
 		struct proc_dir_entry *entry;
 		entry = create_proc_entry("fs/nfs/exports", 0, NULL);
 		if (entry)