OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] autofs4: white space cleanup for waitq.c 

Whitespace and formating changes to waitq code.

Signed-off-by: Ian Kent <raven@themaw.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Ian Kent 2006-03-27 01:14:49 -08:00 committed by Linus Torvalds
parent d7c4a5f108
commit e77fbddf77
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fs/autofs4/waitq.c
View File

@ -33,7 +33,7 @@ void autofs4_catatonic_mode(struct autofs_sb_info *sbi)
sbi->catatonic = 1; sbi->catatonic = 1;
wq = sbi->queues; wq = sbi->queues;
sbi->queues = NULL; /* Erase all wait queues */ sbi->queues = NULL; /* Erase all wait queues */
while ( wq ) { while (wq) {
nwq = wq->next; nwq = wq->next;
wq->status = -ENOENT; /* Magic is gone - report failure */ wq->status = -ENOENT; /* Magic is gone - report failure */
kfree(wq->name); kfree(wq->name);
@ -45,7 +45,6 @@ void autofs4_catatonic_mode(struct autofs_sb_info *sbi)
fput(sbi->pipe); /* Close the pipe */ fput(sbi->pipe); /* Close the pipe */
sbi->pipe = NULL; sbi->pipe = NULL;
} }
shrink_dcache_sb(sbi->sb); shrink_dcache_sb(sbi->sb);
} }
@ -165,7 +164,7 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
int len, status; int len, status;
/* In catatonic mode, we don't wait for nobody */ /* In catatonic mode, we don't wait for nobody */
if ( sbi->catatonic ) if (sbi->catatonic)
return -ENOENT; return -ENOENT;
name = kmalloc(NAME_MAX + 1, GFP_KERNEL); name = kmalloc(NAME_MAX + 1, GFP_KERNEL);
@ -190,7 +189,7 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
break; break;
} }
if ( !wq ) { if (!wq) {
/* Can't wait for an expire if there's no mount */ /* Can't wait for an expire if there's no mount */
if (notify == NFY_NONE && !d_mountpoint(dentry)) { if (notify == NFY_NONE && !d_mountpoint(dentry)) {
kfree(name); kfree(name);
@ -200,7 +199,7 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
/* Create a new wait queue */ /* Create a new wait queue */
wq = kmalloc(sizeof(struct autofs_wait_queue),GFP_KERNEL); wq = kmalloc(sizeof(struct autofs_wait_queue),GFP_KERNEL);
if ( !wq ) { if (!wq) {
kfree(name); kfree(name);
mutex_unlock(&sbi->wq_mutex); mutex_unlock(&sbi->wq_mutex);
return -ENOMEM; return -ENOMEM;
@ -240,14 +239,14 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
/* wq->name is NULL if and only if the lock is already released */ /* wq->name is NULL if and only if the lock is already released */
if ( sbi->catatonic ) { if (sbi->catatonic) {
/* We might have slept, so check again for catatonic mode */ /* We might have slept, so check again for catatonic mode */
wq->status = -ENOENT; wq->status = -ENOENT;
kfree(wq->name); kfree(wq->name);
wq->name = NULL; wq->name = NULL;
} }
if ( wq->name ) { if (wq->name) {
/* Block all but "shutdown" signals while waiting */ /* Block all but "shutdown" signals while waiting */
sigset_t oldset; sigset_t oldset;
unsigned long irqflags; unsigned long irqflags;
@ -283,12 +282,12 @@ int autofs4_wait_release(struct autofs_sb_info *sbi, autofs_wqt_t wait_queue_tok
struct autofs_wait_queue *wq, **wql; struct autofs_wait_queue *wq, **wql;
mutex_lock(&sbi->wq_mutex); mutex_lock(&sbi->wq_mutex);
for ( wql = &sbi->queues ; (wq = *wql) != 0 ; wql = &wq->next ) { for (wql = &sbi->queues ; (wq = *wql) != 0 ; wql = &wq->next) {
if ( wq->wait_queue_token == wait_queue_token ) if (wq->wait_queue_token == wait_queue_token)
break; break;
} }
if ( !wq ) { if (!wq) {
mutex_unlock(&sbi->wq_mutex); mutex_unlock(&sbi->wq_mutex);
return -EINVAL; return -EINVAL;
} }