3 files changed, 23 insertions, 5 deletions

diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 75f309c874..a796be5051 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -14,6 +14,7 @@
 #include <linux/sunrpc/svcsock.h>
 #include <linux/nfs_fs.h>
 #include <linux/mutex.h>
+#include <linux/freezer.h>
 
 #include <net/inet_sock.h>
 
@@ -67,6 +68,7 @@ static void nfs_callback_svc(struct svc_rqst *rqstp)
         daemonize("nfsv4-svc");
         /* Process request with signals blocked, but allow SIGKILL.  */
         allow_signal(SIGKILL);
+        set_freezable();
 
         complete(&nfs_callback_info.started);
 
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 8689b736fd..c87dc713b5 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -53,6 +53,7 @@ static int  nfs_fsync(struct file *, struct dentry *dentry, int datasync);
 static int nfs_check_flags(int flags);
 static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl);
 static int nfs_flock(struct file *filp, int cmd, struct file_lock *fl);
+static int nfs_setlease(struct file *file, long arg, struct file_lock **fl);
 
 const struct file_operations nfs_file_operations = {
         .llseek         = nfs_file_llseek,
@@ -69,6 +70,7 @@ const struct file_operations nfs_file_operations = {
         .flock          = nfs_flock,
         .splice_read    = nfs_file_splice_read,
         .check_flags    = nfs_check_flags,
+        .setlease       = nfs_setlease,
 };
 
 const struct inode_operations nfs_file_inode_operations = {
@@ -400,7 +402,9 @@ static int do_getlk(struct file *filp, int cmd, struct file_lock *fl)
 
         lock_kernel();
         /* Try local locking first */
-        if (posix_test_lock(filp, fl)) {
+        posix_test_lock(filp, fl);
+        if (fl->fl_type != F_UNLCK) {
+                /* found a conflict */
                 goto out;
         }
 
@@ -558,3 +562,13 @@ static int nfs_flock(struct file *filp, int cmd, struct file_lock *fl)
                 return do_unlk(filp, cmd, fl);
         return do_setlk(filp, cmd, fl);
 }
+
+static int nfs_setlease(struct file *file, long arg, struct file_lock **fl)
+{
+        /*
+         * There is no protocol support for leases, so we have no way
+         * to implement them correctly in the face of opens by other
+         * clients.
+         */
+        return -EINVAL;
+}
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index a2b1af89ca..adffe1615c 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -300,7 +300,10 @@ static const struct super_operations nfs4_sops = {
 };
 #endif
 
-static struct shrinker *acl_shrinker;
+static struct shrinker acl_shrinker = {
+        .shrink         = nfs_access_cache_shrinker,
+        .seeks          = DEFAULT_SEEKS,
+};
 
 /*
  * Register the NFS filesystems
@@ -321,7 +324,7 @@ int __init register_nfs_fs(void)
         if (ret < 0)
                 goto error_2;
 #endif
-        acl_shrinker = set_shrinker(DEFAULT_SEEKS, nfs_access_cache_shrinker);
+        register_shrinker(&acl_shrinker);
         return 0;
 
 #ifdef CONFIG_NFS_V4
@@ -339,8 +342,7 @@ error_0:
  */
 void __exit unregister_nfs_fs(void)
 {
-        if (acl_shrinker != NULL)
-                remove_shrinker(acl_shrinker);
+        unregister_shrinker(&acl_shrinker);
 #ifdef CONFIG_NFS_V4
         unregister_filesystem(&nfs4_fs_type);
         nfs_unregister_sysctl();