Here's a minor patch to autofs4. Most of it is cosmetic (for my
convenience), but there's a couple of lines of real substance. The
daemon can't initiate a mount with its accesses, so its best not to set
AUTOFS_PENDING on dentries which are created by daemon accesses, since
this confuses things.
J
diff -X ../diffexcl -Nur 2.3/fs/autofs4/autofs_i.h abulafia-2.3/fs/autofs4/autof
s_i.h
--- 2.3/fs/autofs4/autofs_i.h Wed Apr 12 23:05:48 2000
+++ linux/fs/autofs4/autofs_i.h Wed Apr 12 23:09:29 2000
@@ -1,4 +1,4 @@
-/* -*- linux-c -*- ------------------------------------------------------- *
+/* -*- c -*- ------------------------------------------------------------- *
*
* linux/fs/autofs/autofs_i.h
*
diff -X ../diffexcl -Nur 2.3/fs/autofs4/expire.c abulafia-2.3/fs/autofs4/expire.
c
--- 2.3/fs/autofs4/expire.c Wed Apr 12 23:05:48 2000
+++ linux/fs/autofs4/expire.c Wed Apr 12 23:09:29 2000
@@ -1,4 +1,4 @@
-/* -*- linux-c -*- --------------------------------------------------------- *
+/* -*- c -*- --------------------------------------------------------------- *
*
* linux/fs/autofs/expire.c
*
diff -X ../diffexcl -Nur 2.3/fs/autofs4/init.c abulafia-2.3/fs/autofs4/init.c
--- 2.3/fs/autofs4/init.c Wed Apr 12 23:05:48 2000
+++ linux/fs/autofs4/init.c Wed Apr 12 23:09:29 2000
@@ -1,4 +1,4 @@
-/* -*- linux-c -*- --------------------------------------------------------- *
+/* -*- c -*- --------------------------------------------------------------- *
*
* linux/fs/autofs/init.c
*
diff -X ../diffexcl -Nur 2.3/fs/autofs4/inode.c abulafia-2.3/fs/autofs4/inode.c
--- 2.3/fs/autofs4/inode.c Wed Apr 12 23:05:48 2000
+++ linux/fs/autofs4/inode.c Wed Apr 12 23:09:30 2000
@@ -1,4 +1,4 @@
-/* -*- linux-c -*- --------------------------------------------------------- *
+/* -*- c -*- --------------------------------------------------------------- *
*
* linux/fs/autofs/inode.c
*
diff -X ../diffexcl -Nur 2.3/fs/autofs4/inohash.c abulafia-2.3/fs/autofs4/inohas
h.c
--- 2.3/fs/autofs4/inohash.c Wed Apr 12 23:05:48 2000
+++ linux/fs/autofs4/inohash.c Wed Apr 12 23:09:30 2000
@@ -1,4 +1,5 @@
-/*
+/* -*- c -*-
+ *
* "inohash" is a misnomer. Inodes are just stored in a single list,
* since this code is only ever asked for the most recently inserted
* inode.
diff -X ../diffexcl -Nur 2.3/fs/autofs4/root.c abulafia-2.3/fs/autofs4/root.c
--- 2.3/fs/autofs4/root.c Wed Apr 12 23:05:48 2000
+++ linux/fs/autofs4/root.c Wed Apr 12 23:09:30 2000
@@ -1,4 +1,4 @@
-/* -*- linux-c -*- --------------------------------------------------------- *
+/* -*- c -*- --------------------------------------------------------------- *
*
* linux/fs/autofs/root.c
*
@@ -323,12 +323,10 @@
*
* We need to do this before we release the directory semaphore.
*/
- if (dir->i_ino == AUTOFS_ROOT_INO)
- dentry->d_op = &autofs4_root_dentry_operations;
- else
- dentry->d_op = &autofs4_dentry_operations;
+ dentry->d_op = &autofs4_root_dentry_operations;
- dentry->d_flags |= DCACHE_AUTOFS_PENDING;
+ if (!oz_mode)
+ dentry->d_flags |= DCACHE_AUTOFS_PENDING;
dentry->d_fsdata = NULL;
d_add(dentry, NULL);
diff -X ../diffexcl -Nur 2.3/fs/autofs4/symlink.c abulafia-2.3/fs/autofs4/symlin
k.c
--- 2.3/fs/autofs4/symlink.c Wed Apr 12 23:05:48 2000
+++ linux/fs/autofs4/symlink.c Wed Apr 12 23:09:30 2000
@@ -1,4 +1,4 @@
-/* -*- linux-c -*- --------------------------------------------------------- *
+/* -*- c -*- --------------------------------------------------------------- *
*
* linux/fs/autofs/symlink.c
*
diff -X ../diffexcl -Nur 2.3/fs/autofs4/waitq.c abulafia-2.3/fs/autofs4/waitq.c
--- 2.3/fs/autofs4/waitq.c Wed Apr 12 23:05:48 2000
+++ linux/fs/autofs4/waitq.c Wed Apr 12 23:09:30 2000
@@ -1,4 +1,4 @@
-/* -*- linux-c -*- --------------------------------------------------------- *
+/* -*- c -*- --------------------------------------------------------------- *
*
* linux/fs/autofs/waitq.c
*
End of MIME message
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sat Apr 15 2000 - 21:00:22 EST