Re: Hanging NFS umounts with 2.4.27

[Trond Myklebust <trond.myklebust@fys.uio.no>]

[-- Attachment #1: Type: text/plain, Size: 355 bytes --]

fr den 05.11.2004 Klokka 11:02 (+0100) skreiv Michael Gernoth:

> Searching through the Changesets I found 1.1402.1.19:
> http://linux.bkbits.net:8080/linux-2.4/cset@1.1402.1.19
> After reverting this one, we have a stable umount-behaviour again.
> 

Does the attached patch help at all?

Cheers,
  Trond

-- 
Trond Myklebust <trond.myklebust@fys.uio.no>

[-- Attachment #2: linux-2.4.28-fix_unlink.dif --]
[-- Type: text/plain, Size: 792 bytes --]

  NFS: Always wake up tasks that are waiting on the sillyrenamed file to
       complete.
---
 unlink.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

Index: linux-2.4.28-rc1/fs/nfs/unlink.c
===================================================================
--- linux-2.4.28-rc1.orig/fs/nfs/unlink.c	2004-11-05 11:26:07.832922087 -0800
+++ linux-2.4.28-rc1/fs/nfs/unlink.c	2004-11-05 11:44:38.241824060 -0800
@@ -130,13 +130,14 @@ nfs_async_unlink_done(struct rpc_task *t
 	if (nfs_async_handle_jukebox(task))
 		return;
 	if (!dir)
-		return;
+		goto out;
 	dir_i = dir->d_inode;
 	nfs_zap_caches(dir_i);
 	NFS_PROTO(dir_i)->unlink_done(dir, &task->tk_msg);
 	put_rpccred(data->cred);
 	data->cred = NULL;
 	dput(dir);
+out:
 	data->completed = 1;
 	wake_up(&data->waitq);
 }