Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux

Pull nfsd fixes from Bruce Fields:
 "Small fixes for two bugs and two warnings"

* 'for-3.10' of git://linux-nfs.org/~bfields/linux:
  nfsd: fix oops when legacy_recdir_name_error is passed a -ENOENT error
  SUNRPC: fix decoding of optional gss-proxy xdr fields
  SUNRPC: Refactor gssx_dec_option_array() to kill uninitialized warning
  nfsd4: don't allow owner override on 4.1 CLAIM_FH opens

2 files changed, 18 insertions, 9 deletions

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 8ae5abfe6ba2..27d74a294515 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -279,6 +279,7 @@ do_open_fhandle(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, str
 {
         struct svc_fh *current_fh = &cstate->current_fh;
         __be32 status;
+        int accmode = 0;
 
         /* We don't know the target directory, and therefore can not
         * set the change info
@@ -290,9 +291,19 @@ do_open_fhandle(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, str
 
         open->op_truncate = (open->op_iattr.ia_valid & ATTR_SIZE) &&
                 (open->op_iattr.ia_size == 0);
+        /*
+         * In the delegation case, the client is telling us about an
+         * open that it *already* performed locally, some time ago.  We
+         * should let it succeed now if possible.
+         *
+         * In the case of a CLAIM_FH open, on the other hand, the client
+         * may be counting on us to enforce permissions (the Linux 4.1
+         * client uses this for normal opens, for example).
+         */
+        if (open->op_claim_type == NFS4_OPEN_CLAIM_DELEG_CUR_FH)
+                accmode = NFSD_MAY_OWNER_OVERRIDE;
 
-        status = do_open_permission(rqstp, current_fh, open,
-                                    NFSD_MAY_OWNER_OVERRIDE);
+        status = do_open_permission(rqstp, current_fh, open, accmode);
 
         return status;
 }
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index 899ca26dd194..4e9a21db867a 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -146,7 +146,7 @@ out_no_tfm:
  * then disable recovery tracking.
  */
 static void
-legacy_recdir_name_error(int error)
+legacy_recdir_name_error(struct nfs4_client *clp, int error)
 {
         printk(KERN_ERR "NFSD: unable to generate recoverydir "
                         "name (%d).\n", error);
@@ -159,9 +159,7 @@ legacy_recdir_name_error(int error)
         if (error == -ENOENT) {
                 printk(KERN_ERR "NFSD: disabling legacy clientid tracking. "
                         "Reboot recovery will not function correctly!\n");
-
-                /* the argument is ignored by the legacy exit function */
-                nfsd4_client_tracking_exit(NULL);
+                nfsd4_client_tracking_exit(clp->net);
         }
 }
 
@@ -184,7 +182,7 @@ nfsd4_create_clid_dir(struct nfs4_client *clp)
 
         status = nfs4_make_rec_clidname(dname, &clp->cl_name);
         if (status)
-                return legacy_recdir_name_error(status);
+                return legacy_recdir_name_error(clp, status);
 
         status = nfs4_save_creds(&original_cred);
         if (status < 0)
@@ -341,7 +339,7 @@ nfsd4_remove_clid_dir(struct nfs4_client *clp)
 
         status = nfs4_make_rec_clidname(dname, &clp->cl_name);
         if (status)
-                return legacy_recdir_name_error(status);
+                return legacy_recdir_name_error(clp, status);
 
         status = mnt_want_write_file(nn->rec_file);
         if (status)
@@ -601,7 +599,7 @@ nfsd4_check_legacy_client(struct nfs4_client *clp)
 
         status = nfs4_make_rec_clidname(dname, &clp->cl_name);
         if (status) {
-                legacy_recdir_name_error(status);
+                legacy_recdir_name_error(clp, status);
                 return status;
         }