4 files changed, 14 insertions, 16 deletions

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index e38f4af20950..6418cb6c079b 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1256,10 +1256,20 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry,
         atomic_inc(&sp->so_count);
         p->o_arg.open_flags = flags;
         p->o_arg.fmode = fmode & (FMODE_READ|FMODE_WRITE);
-        p->o_arg.umask = current_umask();
         p->o_arg.claim = nfs4_map_atomic_open_claim(server, claim);
         p->o_arg.share_access = nfs4_map_atomic_open_share(server,
                         fmode, flags);
+        if (flags & O_CREAT) {
+                p->o_arg.umask = current_umask();
+                p->o_arg.label = nfs4_label_copy(p->a_label, label);
+                if (c->sattr != NULL && c->sattr->ia_valid != 0) {
+                        p->o_arg.u.attrs = &p->attrs;
+                        memcpy(&p->attrs, c->sattr, sizeof(p->attrs));
+
+                        memcpy(p->o_arg.u.verifier.data, c->verf,
+                                        sizeof(p->o_arg.u.verifier.data));
+                }
+        }
         /* don't put an ACCESS op in OPEN compound if O_EXCL, because ACCESS
          * will return permission denied for all bits until close */
         if (!(flags & O_EXCL)) {
@@ -1283,7 +1293,6 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry,
         p->o_arg.server = server;
         p->o_arg.bitmask = nfs4_bitmask(server, label);
         p->o_arg.open_bitmap = &nfs4_fattr_bitmap[0];
-        p->o_arg.label = nfs4_label_copy(p->a_label, label);
         switch (p->o_arg.claim) {
         case NFS4_OPEN_CLAIM_NULL:
         case NFS4_OPEN_CLAIM_DELEGATE_CUR:
@@ -1296,13 +1305,6 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry,
         case NFS4_OPEN_CLAIM_DELEG_PREV_FH:
                 p->o_arg.fh = NFS_FH(d_inode(dentry));
         }
-        if (c != NULL && c->sattr != NULL && c->sattr->ia_valid != 0) {
-                p->o_arg.u.attrs = &p->attrs;
-                memcpy(&p->attrs, c->sattr, sizeof(p->attrs));
-
-                memcpy(p->o_arg.u.verifier.data, c->verf,
-                                sizeof(p->o_arg.u.verifier.data));
-        }
         p->c_arg.fh = &p->o_res.fh;
         p->c_arg.stateid = &p->o_res.stateid;
         p->c_arg.seqid = p->o_arg.seqid;
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 627a87a71f8b..b03bfa055c08 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -634,7 +634,6 @@ static struct rpc_clnt *__rpc_clone_client(struct rpc_create_args *args,
         new->cl_discrtry = clnt->cl_discrtry;
         new->cl_chatty = clnt->cl_chatty;
         new->cl_principal = clnt->cl_principal;
-        new->cl_cred = get_cred(clnt->cl_cred);
         return new;
 
 out_err:
@@ -2805,6 +2804,7 @@ int rpc_clnt_add_xprt(struct rpc_clnt *clnt,
         xprt = xprt_iter_xprt(&clnt->cl_xpi);
         if (xps == NULL || xprt == NULL) {
                 rcu_read_unlock();
+                xprt_switch_put(xps);
                 return -EAGAIN;
         }
         resvport = xprt->resvport;
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index bb04ae52803a..a2c114812717 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -250,9 +250,7 @@ static void __rpc_init_priority_wait_queue(struct rpc_wait_queue *queue, const c
         queue->maxpriority = nr_queues - 1;
         rpc_reset_waitqueue_priority(queue);
         queue->qlen = 0;
-        timer_setup(&queue->timer_list.timer,
-                        __rpc_queue_timer_fn,
-                        TIMER_DEFERRABLE);
+        timer_setup(&queue->timer_list.timer, __rpc_queue_timer_fn, 0);
         INIT_LIST_HEAD(&queue->timer_list.list);
         rpc_assign_waitqueue_name(queue, qname);
 }
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index ad21880d5601..f6c82b1651e7 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -1876,9 +1876,7 @@ found:
                 xprt->idle_timeout = 0;
         INIT_WORK(&xprt->task_cleanup, xprt_autoclose);
         if (xprt_has_timer(xprt))
-                timer_setup(&xprt->timer,
-                                xprt_init_autodisconnect,
-                                TIMER_DEFERRABLE);
+                timer_setup(&xprt->timer, xprt_init_autodisconnect, 0);
         else
                 timer_setup(&xprt->timer, NULL, 0);