Merge branch 'bkl-removal' into next

diff --combined fs/nfs/file.c
index 43164fe86069617004c7ccc139588d9d450c7547,9f1bed944b2ec9478ca3f568f73fc21a6d2fbe66..78460657f5cbff1a155a4e5d05ab1ba3ea0e564d
--- 1/fs/nfs/file.c
--- 2/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@@ -128,9 -128,7 +128,7 @@@ nfs_file_open(struct inode *inode, stru
                return res;
  
        nfs_inc_stats(inode, NFSIOS_VFSOPEN);
-       lock_kernel();
        res = nfs_open(inode, filp);
-       unlock_kernel();
        return res;
  }
  
@@@ -180,8 -178,6 +178,8 @@@ force_reval
  
  static loff_t nfs_file_llseek(struct file *filp, loff_t offset, int origin)
  {
 +      loff_t loff;
 +
        dprintk("NFS: llseek file(%s/%s, %lld, %d)\n",
                        filp->f_path.dentry->d_parent->d_name.name,
                        filp->f_path.dentry->d_name.name,
@@@ -194,10 -190,7 +192,10 @@@
                if (retval < 0)
                        return (loff_t)retval;
        }
 -      return remote_llseek(filp, offset, origin);
 +      lock_kernel();  /* BKL needed? */
 +      loff = generic_file_llseek_unlocked(filp, offset, origin);
 +      unlock_kernel();
 +      return loff;
  }
  
  /*
@@@ -398,9 -391,7 +396,7 @@@ static int nfs_write_end(struct file *f
                        zero_user_segment(page, pglen, PAGE_CACHE_SIZE);
        }
  
-       lock_kernel();
        status = nfs_updatepage(file, page, offset, copied);
-       unlock_kernel();
  
        unlock_page(page);
        page_cache_release(page);