adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 04:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

autofs4: fix sparse warning in waitq.c:autofs4_expire_indirect()

Browse source 
Re-order some code in expire.c:autofs4_expire_indirect() to avoid compile
warning, reported by Harvey Harrison:

 CHECK   fs/autofs4/expire.c
fs/autofs4/expire.c:383:2: warning: context imbalance in
'autofs4_expire_indirect' - unexpected unlock

Signed-off-by: Ian Kent <raven@themaw.net>
Reviewed-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ian Kent 2008-05-01 04:35:06 -07:00 committed by Linus Torvalds
parent c32e026efc
commit afec570c32
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
fs/autofs4/expire.c
View file

@ -333,7 +333,7 @@ static struct dentry *autofs4_expire_indirect(struct super_block *sb,
/* Can we expire this guy */ /* Can we expire this guy */
if (autofs4_can_expire(dentry, timeout, do_now)) { if (autofs4_can_expire(dentry, timeout, do_now)) {
expired = dentry; expired = dentry;
break; goto found;
} }
goto next; goto next;
} }
@ -352,7 +352,7 @@ static struct dentry *autofs4_expire_indirect(struct super_block *sb,
inf->flags |= AUTOFS_INF_EXPIRING; inf->flags |= AUTOFS_INF_EXPIRING;
spin_unlock(&sbi->fs_lock); spin_unlock(&sbi->fs_lock);
expired = dentry; expired = dentry;
break; goto found;
} }
spin_unlock(&sbi->fs_lock); spin_unlock(&sbi->fs_lock);
/* /*
@ -363,7 +363,7 @@ static struct dentry *autofs4_expire_indirect(struct super_block *sb,
expired = autofs4_check_leaves(mnt, dentry, timeout, do_now); expired = autofs4_check_leaves(mnt, dentry, timeout, do_now);
if (expired) { if (expired) {
dput(dentry); dput(dentry);
break; goto found;
} }
} }
next: next:
@ -371,18 +371,16 @@ next:
spin_lock(&dcache_lock); spin_lock(&dcache_lock);
next = next->next; next = next->next;
} }
if (expired) {
DPRINTK("returning %p %.*s",
expired, (int)expired->d_name.len, expired->d_name.name);
spin_lock(&dcache_lock);
list_move(&expired->d_parent->d_subdirs, &expired->d_u.d_child);
spin_unlock(&dcache_lock);
return expired;
}
spin_unlock(&dcache_lock); spin_unlock(&dcache_lock);
return NULL; return NULL;
found:
DPRINTK("returning %p %.*s",
expired, (int)expired->d_name.len, expired->d_name.name);
spin_lock(&dcache_lock);
list_move(&expired->d_parent->d_subdirs, &expired->d_u.d_child);
spin_unlock(&dcache_lock);
return expired;
} }
/* Perform an expiry operation */ /* Perform an expiry operation */