Attachment 147336 Details for Bug 227303 – patch to fix autofs manually umount problem.

patch to fix autofs manually umount problem.

linux-2.6.9-autofs4-umount.patch (text/plain), 1.93 KB, created by wengang wang on 2007-02-05 02:49:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: wengang wang

Created: 2007-02-05 02:49:31 UTC

Size: 1.93 KB

patch

obsolete

>--- linux-2.6.9/fs/autofs4/root.c.orig	2006-12-07 02:52:39.000000000 -0500
>+++ linux-2.6.9/fs/autofs4/root.c	2006-12-07 02:53:39.000000000 -0500
>@@ -374,6 +374,30 @@
> }
> 
> /*
>+*This function will return the pointer of  the dentry which
>+*just follows root("/") from the dentry path including the
>+*dentry passed as parameter.
>+*/
>+static struct dentry *autofs4_get_2nd_dentry_from_path(struct dentry* dentry){
>+        struct dentry *resdentry = NULL;
>+        spin_lock(&dcache_lock);
>+        while(dentry){
>+                struct dentry *tmp = dentry->d_parent;
>+                if(tmp && tmp != dentry){
>+                        if(tmp->d_name.len == 1 && tmp->d_name.name[0] == '/'){
>+                                resdentry = dentry;
>+                                break;
>+                        }
>+                        dentry = tmp;
>+                }else{
>+                        dentry = NULL;
>+                }
>+        }
>+        spin_unlock(&dcache_lock);
>+        return resdentry;
>+}
>+
>+/*
>  * Revalidate is called on every cache lookup.  Some of those
>  * cache lookups may actually happen while the dentry is not
>  * yet completely filled in, and revalidate has to delay such
>@@ -406,8 +430,15 @@
> 		DPRINTK("dentry=%p %.*s, emptydir",
> 			 dentry, dentry->d_name.len, dentry->d_name.name);
> 		spin_unlock(&dcache_lock);
>-		if (!oz_mode)
>-			status = try_to_fill_dentry(dentry, dir->i_sb, sbi, flags);
>+                if (!oz_mode){
>+                        struct dentry* the_2nd_dentry = autofs4_get_2nd_dentry_from_path(dentry);
>+                        if(the_2nd_dentry){
>+                                status = try_to_fill_dentry(the_2nd_dentry, dir->i_sb, sbi, flags);
>+                                //status = 0;
>+                        }else{
>+                                status = try_to_fill_dentry(dentry, dir->i_sb, sbi, flags);
>+                        }
>+                }
> 		return status;
> 	}
> 	spin_unlock(&dcache_lock);

Actions: View

Attachments on bug 227303: 147336