From: Ian Kent <raven@themaw.net>
Correct text in DPRINTK messages and comments, a little reformating and
correct URL location for autofs v4 in Kconfig message.
---
25-akpm/fs/Kconfig | 2 +-
25-akpm/fs/autofs4/root.c | 23 +++++++++++------------
25-akpm/fs/autofs4/waitq.c | 19 ++++++++++---------
3 files changed, 22 insertions(+), 22 deletions(-)
diff -puN fs/autofs4/root.c~1-autofs4-2.6.4-cleanup-20040405 fs/autofs4/root.c
--- 25/fs/autofs4/root.c~1-autofs4-2.6.4-cleanup-20040405 Mon May 10 15:35:31 2004
+++ 25-akpm/fs/autofs4/root.c Mon May 10 15:35:31 2004
@@ -78,10 +78,9 @@ static int try_to_fill_dentry(struct den
when expiration is done to trigger mount request with a new
dentry */
if (de_info && (de_info->flags & AUTOFS_INF_EXPIRING)) {
- DPRINTK(("try_to_fill_entry: waiting for expire %p name=%.*s, flags&PENDING=%s de_info=%p de_info->flags=%x\n",
- dentry, dentry->d_name.len, dentry->d_name.name,
- dentry->d_flags & DCACHE_AUTOFS_PENDING?"t":"f",
- de_info, de_info?de_info->flags:0));
+ DPRINTK(("try_to_fill_entry: waiting for expire %p name=%.*s\n",
+ dentry, dentry->d_name.len, dentry->d_name.name));
+
status = autofs4_wait(sbi, &dentry->d_name, NFY_NONE);
DPRINTK(("try_to_fill_entry: expire done status=%d\n", status));
@@ -166,7 +165,7 @@ static int autofs4_root_revalidate(struc
if (S_ISDIR(dentry->d_inode->i_mode) &&
!d_mountpoint(dentry) &&
list_empty(&dentry->d_subdirs)) {
- DPRINTK(("autofs_root_revalidate: dentry=%p %.*s, emptydir\n",
+ DPRINTK(("autofs4_root_revalidate: dentry=%p %.*s, emptydir\n",
dentry, dentry->d_name.len, dentry->d_name.name));
spin_unlock(&dcache_lock);
if (oz_mode)
@@ -244,7 +243,7 @@ static struct dentry *autofs4_root_looku
struct autofs_sb_info *sbi;
int oz_mode;
- DPRINTK(("autofs_root_lookup: name = %.*s\n",
+ DPRINTK(("autofs4_root_lookup: name = %.*s\n",
dentry->d_name.len, dentry->d_name.name));
if (dentry->d_name.len > NAME_MAX)
@@ -254,7 +253,7 @@ static struct dentry *autofs4_root_looku
lock_kernel();
oz_mode = autofs4_oz_mode(sbi);
- DPRINTK(("autofs_lookup: pid = %u, pgrp = %u, catatonic = %d, oz_mode = %d\n",
+ DPRINTK(("autofs4_lookup: pid = %u, pgrp = %u, catatonic = %d, oz_mode = %d\n",
current->pid, process_group(current), sbi->catatonic, oz_mode));
/*
@@ -319,7 +318,7 @@ static int autofs4_dir_symlink(struct in
struct inode *inode;
char *cp;
- DPRINTK(("autofs_dir_symlink: %s <- %.*s\n", symname,
+ DPRINTK(("autofs4_dir_symlink: %s <- %.*s\n", symname,
dentry->d_name.len, dentry->d_name.name));
lock_kernel();
@@ -376,7 +375,7 @@ static int autofs4_dir_symlink(struct in
* If a process is blocked on the dentry waiting for the expire to finish,
* it will invalidate the dentry and try to mount with a new one.
*
- * Also see autofs_dir_rmdir()..
+ * Also see autofs4_dir_rmdir()..
*/
static int autofs4_dir_unlink(struct inode *dir, struct dentry *dentry)
{
@@ -450,7 +449,7 @@ static int autofs4_dir_mkdir(struct inod
return -EACCES;
}
- DPRINTK(("autofs_dir_mkdir: dentry %p, creating %.*s\n",
+ DPRINTK(("autofs4_dir_mkdir: dentry %p, creating %.*s\n",
dentry, dentry->d_name.len, dentry->d_name.name));
ino = autofs4_init_ino(ino, sbi, S_IFDIR | 0555);
@@ -502,7 +501,7 @@ static inline int autofs4_get_protover(s
return put_user(sbi->version, p);
}
-/* Identify autofs_dentries - this is so we can tell if there's
+/* Identify autofs4_dentries - this is so we can tell if there's
an extra dentry refcount or not. We only hold a refcount on the
dentry if its non-negative (ie, d_inode != NULL)
*/
@@ -523,7 +522,7 @@ static int autofs4_root_ioctl(struct ino
{
struct autofs_sb_info *sbi = autofs4_sbi(inode->i_sb);
- DPRINTK(("autofs_ioctl: cmd = 0x%08x, arg = 0x%08lx, sbi = %p, pgrp = %u\n",
+ DPRINTK(("autofs4_root_ioctl: cmd = 0x%08x, arg = 0x%08lx, sbi = %p, pgrp = %u\n",
cmd,arg,sbi,process_group(current)));
if ( _IOC_TYPE(cmd) != _IOC_TYPE(AUTOFS_IOC_FIRST) ||
diff -puN fs/autofs4/waitq.c~1-autofs4-2.6.4-cleanup-20040405 fs/autofs4/waitq.c
--- 25/fs/autofs4/waitq.c~1-autofs4-2.6.4-cleanup-20040405 Mon May 10 15:35:31 2004
+++ 25-akpm/fs/autofs4/waitq.c Mon May 10 15:35:31 2004
@@ -90,7 +90,7 @@ static void autofs4_notify_daemon(struct
union autofs_packet_union pkt;
size_t pktsz;
- DPRINTK(("autofs_notify: wait id = 0x%08lx, name = %.*s, type=%d\n",
+ DPRINTK(("autofs4_notify_daemon: wait id = 0x%08lx, name = %.*s, type=%d\n",
wq->wait_queue_token, wq->len, wq->name, type));
memset(&pkt,0,sizeof pkt); /* For security reasons */
@@ -116,7 +116,7 @@ static void autofs4_notify_daemon(struct
memcpy(ep->name, wq->name, wq->len);
ep->name[wq->len] = '\0';
} else {
- printk("autofs_notify_daemon: bad type %d!\n", type);
+ printk("autofs4_notify_daemon: bad type %d!\n", type);
return;
}
@@ -167,19 +167,20 @@ int autofs4_wait(struct autofs_sb_info *
wq->next = sbi->queues;
sbi->queues = wq;
- DPRINTK(("autofs_wait: new wait id = 0x%08lx, name = %.*s, nfy=%d\n",
- wq->wait_queue_token, wq->len, wq->name, notify));
+ DPRINTK(("autofs4_wait: new wait id = 0x%08lx, name = %.*s, nfy=%d\n",
+ (unsigned long) wq->wait_queue_token, wq->len, wq->name, notify));
/* autofs4_notify_daemon() may block */
wq->wait_ctr = 2;
if (notify != NFY_NONE) {
autofs4_notify_daemon(sbi,wq,
- notify == NFY_MOUNT ? autofs_ptype_missing :
- autofs_ptype_expire_multi);
+ notify == NFY_MOUNT ?
+ autofs_ptype_missing :
+ autofs_ptype_expire_multi);
}
} else {
wq->wait_ctr++;
- DPRINTK(("autofs_wait: existing wait id = 0x%08lx, name = %.*s, nfy=%d\n",
- wq->wait_queue_token, wq->len, wq->name, notify));
+ DPRINTK(("autofs4_wait: existing wait id = 0x%08lx, name = %.*s, nfy=%d\n",
+ (unsigned long) wq->wait_queue_token, wq->len, wq->name, notify));
}
/* wq->name is NULL if and only if the lock is already released */
@@ -211,7 +212,7 @@ int autofs4_wait(struct autofs_sb_info *
recalc_sigpending();
spin_unlock_irqrestore(¤t->sighand->siglock, irqflags);
} else {
- DPRINTK(("autofs_wait: skipped sleeping\n"));
+ DPRINTK(("autofs4_wait: skipped sleeping\n"));
}
status = wq->status;
diff -puN fs/Kconfig~1-autofs4-2.6.4-cleanup-20040405 fs/Kconfig
--- 25/fs/Kconfig~1-autofs4-2.6.4-cleanup-20040405 Mon May 10 15:35:31 2004
+++ 25-akpm/fs/Kconfig Mon May 10 15:35:31 2004
@@ -502,7 +502,7 @@ config AUTOFS4_FS
automounter (amd), which is a pure user space daemon.
To use the automounter you need the user-space tools from
- <ftp://ftp.kernel.org/pub/linux/daemons/autofs/testing-v4/>; you also
+ <ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/>; you also
want to answer Y to "NFS file system support", below.
To compile this support as a module, choose M here: the module will be
_