diff --git a/[refs] b/[refs]
index 5fedd7e1d0f1..1b1724f05459 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20673406534176ead9b984a84b662928110f77b1
+refs/heads/master: 61d5eb2985b3b1d69fd53d7dc9789037c27f8d91
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index 18da8abbece8..58b1f744c91e 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -1703,6 +1703,8 @@ int nfs_access_cache_shrinker(int nr_to_scan, gfp_t gfp_mask)
 	struct nfs_inode *nfsi;
 	struct nfs_access_entry *cache;
 
+	if ((gfp_mask & GFP_KERNEL) != GFP_KERNEL)
+		return (nr_to_scan == 0) ? 0 : -1;
 restart:
 	spin_lock(&nfs_access_lru_lock);
 	list_for_each_entry(nfsi, &nfs_access_lru_list, access_cache_inode_lru) {