1 files changed, 5 insertions, 4 deletions

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 9927913c97c2..68921b01b792 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -75,7 +75,7 @@ nfs_fattr_to_ino_t(struct nfs_fattr *fattr)
  * nfs_wait_bit_killable - helper for functions that are sleeping on bit locks
  * @word: long word containing the bit lock
  */
-int nfs_wait_bit_killable(void *word)
+int nfs_wait_bit_killable(struct wait_bit_key *key)
 {
         if (fatal_signal_pending(current))
                 return -ERESTARTSYS;
@@ -1074,8 +1074,8 @@ int nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping)
          * the bit lock here if it looks like we're going to be doing that.
          */
         for (;;) {
-                ret = wait_on_bit(bitlock, NFS_INO_INVALIDATING,
-                                  nfs_wait_bit_killable, TASK_KILLABLE);
+                ret = wait_on_bit_action(bitlock, NFS_INO_INVALIDATING,
+                                         nfs_wait_bit_killable, TASK_KILLABLE);
                 if (ret)
                         goto out;
                 spin_lock(&inode->i_lock);
@@ -1840,11 +1840,12 @@ EXPORT_SYMBOL_GPL(nfs_net_id);
 static int nfs_net_init(struct net *net)
 {
         nfs_clients_init(net);
-        return 0;
+        return nfs_fs_proc_net_init(net);
 }
 
 static void nfs_net_exit(struct net *net)
 {
+        nfs_fs_proc_net_exit(net);
         nfs_cleanup_cb_ident_idr(net);
 }