6 files changed, 39 insertions, 35 deletions

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index e79bc6ce828e..de434f309af0 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -2006,17 +2006,18 @@ static void nfs_access_free_list(struct list_head *head)
         }
 }
 
-int nfs_access_cache_shrinker(struct shrinker *shrink,
-                              struct shrink_control *sc)
+unsigned long
+nfs_access_cache_scan(struct shrinker *shrink, struct shrink_control *sc)
 {
         LIST_HEAD(head);
         struct nfs_inode *nfsi, *next;
         struct nfs_access_entry *cache;
         int nr_to_scan = sc->nr_to_scan;
         gfp_t gfp_mask = sc->gfp_mask;
+        long freed = 0;
 
         if ((gfp_mask & GFP_KERNEL) != GFP_KERNEL)
-                return (nr_to_scan == 0) ? 0 : -1;
+                return SHRINK_STOP;
 
         spin_lock(&nfs_access_lru_lock);
         list_for_each_entry_safe(nfsi, next, &nfs_access_lru_list, access_cache_inode_lru) {
@@ -2032,6 +2033,7 @@ int nfs_access_cache_shrinker(struct shrinker *shrink,
                                 struct nfs_access_entry, lru);
                 list_move(&cache->lru, &head);
                 rb_erase(&cache->rb_node, &nfsi->access_cache);
+                freed++;
                 if (!list_empty(&nfsi->access_cache_entry_lru))
                         list_move_tail(&nfsi->access_cache_inode_lru,
                                         &nfs_access_lru_list);
@@ -2046,7 +2048,13 @@ remove_lru_entry:
         }
         spin_unlock(&nfs_access_lru_lock);
         nfs_access_free_list(&head);
-        return (atomic_long_read(&nfs_access_nr_entries) / 100) * sysctl_vfs_cache_pressure;
+        return freed;
+}
+
+unsigned long
+nfs_access_cache_count(struct shrinker *shrink, struct shrink_control *sc)
+{
+        return vfs_pressure_ratio(atomic_long_read(&nfs_access_nr_entries));
 }
 
 static void __nfs_access_zap_cache(struct nfs_inode *nfsi, struct list_head *head)
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index d388302c005f..38da8c2b81ac 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -273,8 +273,10 @@ extern struct nfs_client *nfs_init_client(struct nfs_client *clp,
                            const char *ip_addr);
 
 /* dir.c */
-extern int nfs_access_cache_shrinker(struct shrinker *shrink,
-                                        struct shrink_control *sc);
+extern unsigned long nfs_access_cache_count(struct shrinker *shrink,
+                                            struct shrink_control *sc);
+extern unsigned long nfs_access_cache_scan(struct shrinker *shrink,
+                                           struct shrink_control *sc);
 struct dentry *nfs_lookup(struct inode *, struct dentry *, unsigned int);
 int nfs_create(struct inode *, struct dentry *, umode_t, bool);
 int nfs_mkdir(struct inode *, struct dentry *, umode_t);
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index f520a1113b38..28842abafab4 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -279,15 +279,15 @@ _nfs4_state_protect(struct nfs_client *clp, unsigned long sp4_mode,
         if (test_bit(sp4_mode, &clp->cl_sp4_flags)) {
                 spin_lock(&clp->cl_lock);
                 if (clp->cl_machine_cred != NULL)
-                        newcred = get_rpccred(clp->cl_machine_cred);
+                        /* don't call get_rpccred on the machine cred -
+                         * a reference will be held for life of clp */
+                        newcred = clp->cl_machine_cred;
                 spin_unlock(&clp->cl_lock);
-                if (msg->rpc_cred)
-                        put_rpccred(msg->rpc_cred);
                 msg->rpc_cred = newcred;
 
                 flavor = clp->cl_rpcclient->cl_auth->au_flavor;
-                WARN_ON(flavor != RPC_AUTH_GSS_KRB5I &&
-                        flavor != RPC_AUTH_GSS_KRB5P);
+                WARN_ON_ONCE(flavor != RPC_AUTH_GSS_KRB5I &&
+                             flavor != RPC_AUTH_GSS_KRB5P);
                 *clntp = clp->cl_rpcclient;
 
                 return true;
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 39b6cf2d1683..989bb9d3074d 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -6001,10 +6001,12 @@ static int _nfs4_proc_secinfo(struct inode *dir, const struct qstr *name, struct
                 .rpc_resp = &res,
         };
         struct rpc_clnt *clnt = NFS_SERVER(dir)->client;
+        struct rpc_cred *cred = NULL;
 
         if (use_integrity) {
                 clnt = NFS_SERVER(dir)->nfs_client->cl_rpcclient;
-                msg.rpc_cred = nfs4_get_clid_cred(NFS_SERVER(dir)->nfs_client);
+                cred = nfs4_get_clid_cred(NFS_SERVER(dir)->nfs_client);
+                msg.rpc_cred = cred;
         }
 
         dprintk("NFS call  secinfo %s\n", name->name);
@@ -6016,8 +6018,8 @@ static int _nfs4_proc_secinfo(struct inode *dir, const struct qstr *name, struct
                                 &res.seq_res, 0);
         dprintk("NFS reply  secinfo: %d\n", status);
 
-        if (msg.rpc_cred)
-                put_rpccred(msg.rpc_cred);
+        if (cred)
+                put_rpccred(cred);
 
         return status;
 }
@@ -6151,11 +6153,13 @@ static const struct nfs41_state_protection nfs4_sp4_mach_cred_request = {
         },
         .allow.u.words = {
                 [0] = 1 << (OP_CLOSE) |
-                      1 << (OP_LOCKU),
+                      1 << (OP_LOCKU) |
+                      1 << (OP_COMMIT),
                 [1] = 1 << (OP_SECINFO - 32) |
                       1 << (OP_SECINFO_NO_NAME - 32) |
                       1 << (OP_TEST_STATEID - 32) |
-                      1 << (OP_FREE_STATEID - 32)
+                      1 << (OP_FREE_STATEID - 32) |
+                      1 << (OP_WRITE - 32)
         }
 };
 
@@ -7496,11 +7500,13 @@ _nfs41_proc_secinfo_no_name(struct nfs_server *server, struct nfs_fh *fhandle,
                 .rpc_resp = &res,
         };
         struct rpc_clnt *clnt = server->client;
+        struct rpc_cred *cred = NULL;
         int status;
 
         if (use_integrity) {
                 clnt = server->nfs_client->cl_rpcclient;
-                msg.rpc_cred = nfs4_get_clid_cred(server->nfs_client);
+                cred = nfs4_get_clid_cred(server->nfs_client);
+                msg.rpc_cred = cred;
         }
 
         dprintk("--> %s\n", __func__);
@@ -7508,8 +7514,8 @@ _nfs41_proc_secinfo_no_name(struct nfs_server *server, struct nfs_fh *fhandle,
                                 &res.seq_res, 0);
         dprintk("<-- %s status=%d\n", __func__, status);
 
-        if (msg.rpc_cred)
-                put_rpccred(msg.rpc_cred);
+        if (cred)
+                put_rpccred(cred);
 
         return status;
 }
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index fbdad9e1719f..79210d23f607 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -414,7 +414,7 @@ static int nfs4_stat_to_errno(int);
 #define decode_test_stateid_maxsz       (op_decode_hdr_maxsz + 2 + 1)
 #define encode_free_stateid_maxsz       (op_encode_hdr_maxsz + 1 + \
                                          XDR_QUADLEN(NFS4_STATEID_SIZE))
-#define decode_free_stateid_maxsz       (op_decode_hdr_maxsz + 1)
+#define decode_free_stateid_maxsz       (op_decode_hdr_maxsz)
 #else /* CONFIG_NFS_V4_1 */
 #define encode_sequence_maxsz   0
 #define decode_sequence_maxsz   0
@@ -5966,21 +5966,8 @@ out:
 static int decode_free_stateid(struct xdr_stream *xdr,
                                struct nfs41_free_stateid_res *res)
 {
-        __be32 *p;
-        int status;
-
-        status = decode_op_hdr(xdr, OP_FREE_STATEID);
-        if (status)
-                return status;
-
-        p = xdr_inline_decode(xdr, 4);
-        if (unlikely(!p))
-                goto out_overflow;
-        res->status = be32_to_cpup(p++);
+        res->status = decode_op_hdr(xdr, OP_FREE_STATEID);
         return res->status;
-out_overflow:
-        print_overflow_msg(__func__, xdr);
-        return -EIO;
 }
 #endif /* CONFIG_NFS_V4_1 */
 
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 5793f24613c8..a03b9c6f9489 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -360,7 +360,8 @@ static void unregister_nfs4_fs(void)
 #endif
 
 static struct shrinker acl_shrinker = {
-        .shrink         = nfs_access_cache_shrinker,
+        .count_objects  = nfs_access_cache_count,
+        .scan_objects   = nfs_access_cache_scan,
         .seeks          = DEFAULT_SEEKS,
 };