[PATCH] nfsd4: stop overusing RECLAIM_BAD

[linux-2.6-block.git] / fs / nfsd / nfs4state.c

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 6cca358cd6507ea552a452432b69cc5c9cf154f2..142b63bc2051ffa563d99d1ab429bb416d779aaf 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -48,6 +48,7 @@
 #include <linux/nfs4.h>
 #include <linux/nfsd/state.h>
 #include <linux/nfsd/xdr4.h>
+#include <linux/namei.h>
 
 #define NFSDDBG_FACILITY                NFSDDBG_PROC
 
@@ -71,7 +72,8 @@ static stateid_t onestateid;              /* bits all 1 */
 static struct nfs4_stateid * find_stateid(stateid_t *stid, int flags);
 static struct nfs4_delegation * find_delegation_stateid(struct inode *ino, stateid_t *stid);
 static void release_stateid_lockowners(struct nfs4_stateid *open_stp);
-extern char recovery_dirname[];
+static char user_recovery_dirname[PATH_MAX] = "/var/lib/nfs/v4recovery";
+static void nfs4_set_recdir(char *recdir);
 
 /* Locking:
  *
@@ -872,6 +874,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, struct nfsd4_setclientid_confi
                          * change request correctly. */
                        atomic_set(&conf->cl_callback.cb_set, 0);
                        gen_confirm(conf);
+                       nfsd4_remove_clid_dir(unconf);
                        expire_client(unconf);
                        status = nfs_ok;
 
@@ -1528,8 +1531,6 @@ renew:
        status = nfs_ok;
        renew_client(sop->so_client);
 out:
-       if (status && open->op_claim_type == NFS4_OPEN_CLAIM_PREVIOUS)
-               status = nfserr_reclaim_bad;
        return status;
 }
 
@@ -1685,17 +1686,11 @@ nfs4_upgrade_open(struct svc_rqst *rqstp, struct svc_fh *cur_fh, struct nfs4_sta
 
 /* decrement seqid on successful reclaim, it will be bumped in encode_open */
 static void
-nfs4_set_claim_prev(struct nfsd4_open *open, int *status)
+nfs4_set_claim_prev(struct nfsd4_open *open)
 {
-       if (open->op_claim_type == NFS4_OPEN_CLAIM_PREVIOUS) {
-               if (*status)
-                       *status = nfserr_reclaim_bad;
-               else {
-                       open->op_stateowner->so_confirmed = 1;
-                       open->op_stateowner->so_client->cl_firststate = 1;
-                       open->op_stateowner->so_seqid--;
-               }
-       }
+       open->op_stateowner->so_confirmed = 1;
+       open->op_stateowner->so_client->cl_firststate = 1;
+       open->op_stateowner->so_seqid--;
 }
 
 /*
@@ -1787,6 +1782,12 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
        struct nfs4_delegation *dp = NULL;
        int status;
 
+       if (nfs4_in_grace() && open->op_claim_type != NFS4_OPEN_CLAIM_PREVIOUS)
+               return nfserr_grace;
+
+       if (!nfs4_in_grace() && open->op_claim_type == NFS4_OPEN_CLAIM_PREVIOUS)
+               return nfserr_no_grace;
+
        status = nfserr_inval;
        if (!TEST_ACCESS(open->op_share_access) || !TEST_DENY(open->op_share_deny))
                goto out;
@@ -1854,8 +1855,8 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
 out:
        if (fp)
                put_nfs4_file(fp);
-       /* CLAIM_PREVIOUS has different error returns */
-       nfs4_set_claim_prev(open, &status);
+       if (status == 0 && open->op_claim_type == NFS4_OPEN_CLAIM_PREVIOUS)
+               nfs4_set_claim_prev(open);
        /*
        * To finish the open response, we just need to set the rflags.
        */
@@ -2697,11 +2698,6 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
                (long long) lock->lk_offset,
                (long long) lock->lk_length);
 
-       if (nfs4_in_grace() && !lock->lk_reclaim)
-               return nfserr_grace;
-       if (!nfs4_in_grace() && lock->lk_reclaim)
-               return nfserr_no_grace;
-
        if (check_lock_length(lock->lk_offset, lock->lk_length))
                 return nfserr_inval;
 
@@ -2734,11 +2730,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
                                        CHECK_FH | OPEN_STATE,
                                        &open_sop, &open_stp,
                                        &lock->v.new.clientid);
-               if (status) {
-                       if (lock->lk_reclaim)
-                               status = nfserr_reclaim_bad;
+               if (status)
                        goto out;
-               }
                /* create lockowner and lock stateid */
                fp = open_stp->st_file;
                strhashval = lock_ownerstr_hashval(fp->fi_inode, 
@@ -2776,6 +2769,13 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
                goto out;
        }
 
+       status = nfserr_grace;
+       if (nfs4_in_grace() && !lock->lk_reclaim)
+               goto out;
+       status = nfserr_no_grace;
+       if (!nfs4_in_grace() && lock->lk_reclaim)
+               goto out;
+
        locks_init_lock(&file_lock);
        switch (lock->lk_type) {
                case NFS4_READ_LT:
@@ -3081,7 +3081,12 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp, struct nfsd4_release_lockowner *
         * of the lockowner state released; so don't release any until all
         * have been checked. */
        status = nfs_ok;
-       list_for_each_entry(sop, &matches, so_perclient) {
+       while (!list_empty(&matches)) {
+               sop = list_entry(matches.next, struct nfs4_stateowner,
+                                                               so_perclient);
+               /* unhash_stateowner deletes so_perclient only
+                * for openowners. */
+               list_del(&sop->so_perclient);
                release_stateowner(sop);
        }
 out:
@@ -3224,8 +3229,10 @@ nfsd4_load_reboot_recovery_data(void)
 {
        int status;
 
-       nfsd4_init_recdir(recovery_dirname);
+       nfs4_lock_state();
+       nfsd4_init_recdir(user_recovery_dirname);
        status = nfsd4_recdir_load();
+       nfs4_unlock_state();
        if (status)
                printk("NFSD: Failure reading reboot recovery data\n");
 }
@@ -3329,6 +3336,35 @@ nfs4_state_shutdown(void)
        nfs4_unlock_state();
 }
 
+static void
+nfs4_set_recdir(char *recdir)
+{
+       nfs4_lock_state();
+       strcpy(user_recovery_dirname, recdir);
+       nfs4_unlock_state();
+}
+
+/*
+ * Change the NFSv4 recovery directory to recdir.
+ */
+int
+nfs4_reset_recoverydir(char *recdir)
+{
+       int status;
+       struct nameidata nd;
+
+       status = path_lookup(recdir, LOOKUP_FOLLOW, &nd);
+       if (status)
+               return status;
+       status = -ENOTDIR;
+       if (S_ISDIR(nd.dentry->d_inode->i_mode)) {
+               nfs4_set_recdir(recdir);
+               status = 0;
+       }
+       path_release(&nd);
+       return status;
+}
+
 /*
  * Called when leasetime is changed.
  *