1 files changed, 24 insertions, 4 deletions

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 161afdcb8f7d..841c562991e8 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -51,6 +51,7 @@ enum {
         NFSD_Fh,
         NFSD_Threads,
         NFSD_Leasetime,
+        NFSD_RecoveryDir,
 };
 
 /*
@@ -66,6 +67,7 @@ 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_recoverydir(struct file *file, char *buf, size_t size);
 
 static ssize_t (*write_op[])(struct file *, char *, size_t) = {
         [NFSD_Svc] = write_svc,
@@ -78,6 +80,7 @@ static ssize_t (*write_op[])(struct file *, char *, size_t) = {
         [NFSD_Fh] = write_filehandle,
         [NFSD_Threads] = write_threads,
         [NFSD_Leasetime] = write_leasetime,
+        [NFSD_RecoveryDir] = write_recoverydir,
 };
 
 static ssize_t nfsctl_transaction_write(struct file *file, const char __user *buf, size_t size, loff_t *pos)
@@ -349,6 +352,25 @@ static ssize_t write_leasetime(struct file *file, char *buf, size_t size)
         return strlen(buf);
 }
 
+static ssize_t write_recoverydir(struct file *file, char *buf, size_t size)
+{
+        char *mesg = buf;
+        char *recdir;
+        int len, status;
+
+        if (size > PATH_MAX || buf[size-1] != '\n')
+                return -EINVAL;
+        buf[size-1] = 0;
+
+        recdir = mesg;
+        len = qword_get(&mesg, recdir, size);
+        if (len <= 0)
+                return -EINVAL;
+
+        status = nfs4_reset_recoverydir(recdir);
+        return strlen(buf);
+}
+
 /*----------------------------------------------------------------------------*/
 /*
  *      populating the filesystem.
@@ -369,6 +391,7 @@ static int nfsd_fill_super(struct super_block * sb, void * data, int silent)
                 [NFSD_Threads] = {"threads", &transaction_ops, S_IWUSR|S_IRUSR},
 #ifdef CONFIG_NFSD_V4
                 [NFSD_Leasetime] = {"nfsv4leasetime", &transaction_ops, S_IWUSR|S_IRUSR},
+                [NFSD_RecoveryDir] = {"nfsv4recoverydir", &transaction_ops, S_IWUSR|S_IRUSR},
 #endif
                 /* last one */ {""}
         };
@@ -397,9 +420,8 @@ static int __init init_nfsd(void)
         nfsd_cache_init();      /* RPC reply cache */
         nfsd_export_init();     /* Exports table */
         nfsd_lockd_init();      /* lockd->nfsd callbacks */
-#ifdef CONFIG_NFSD_V4
+        nfs4_state_init();      /* NFSv4 locking state */
         nfsd_idmap_init();      /* Name to ID mapping */
-#endif /* CONFIG_NFSD_V4 */
         if (proc_mkdir("fs/nfs", NULL)) {
                 struct proc_dir_entry *entry;
                 entry = create_proc_entry("fs/nfs/exports", 0, NULL);
@@ -426,9 +448,7 @@ static void __exit exit_nfsd(void)
         remove_proc_entry("fs/nfs", NULL);
         nfsd_stat_shutdown();
         nfsd_lockd_shutdown();
-#ifdef CONFIG_NFSD_V4
         nfsd_idmap_shutdown();
-#endif /* CONFIG_NFSD_V4 */
         unregister_filesystem(&nfsd_fs_type);
 }