NFS: Re-enable forced umounts

They disappeared some time around 2.6.18.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index ca20d3cc260908b485f7d3bf4279ad3d718d97c4..14c7923697d2521af994eecc1819d857988d375d 100644 (file)
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -430,7 +430,20 @@ static int nfs_show_stats(struct seq_file *m, struct vfsmount *mnt)
  */
 static void nfs_umount_begin(struct vfsmount *vfsmnt, int flags)
 {
  */
 static void nfs_umount_begin(struct vfsmount *vfsmnt, int flags)
 {

+       struct nfs_server *server = NFS_SB(vfsmnt->mnt_sb);
+       struct rpc_clnt *rpc;
+

        shrink_submounts(vfsmnt, &nfs_automount_list);
        shrink_submounts(vfsmnt, &nfs_automount_list);

+
+       if (!(flags & MNT_FORCE))
+               return;
+       /* -EIO all pending I/O */
+       rpc = server->client_acl;
+       if (!IS_ERR(rpc))
+               rpc_killall_tasks(rpc);
+       rpc = server->client;
+       if (!IS_ERR(rpc))
+               rpc_killall_tasks(rpc);

 }
 
 /*
 }
 
 /*