Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc6ae3cf authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Re-enable forced umounts



They disappeared some time around 2.6.18.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 83d93f22
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -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)
{
	struct nfs_server *server = NFS_SB(vfsmnt->mnt_sb);
	struct rpc_clnt *rpc;

	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);
}

/*