hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PATCH] ufs: unlock_super without lock 

ufs_free_blocks function looks now in so way:
if (err)
 goto failed;
 lock_super();
failed:
 unlock_super();

So if error happen we'll unlock not locked super.

Signed-off-by: Evgeniy Dushistov <dushistov@mail.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Evgeniy Dushistov 2006-06-25 05:47:26 -07:00 committed by Linus Torvalds
parent 50aa4eb0b9
commit 2e006393ba
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/ufs/balloc.c
View File

@ -156,7 +156,7 @@ do_more:
bit = ufs_dtogd (fragment); bit = ufs_dtogd (fragment);
if (cgno >= uspi->s_ncg) { if (cgno >= uspi->s_ncg) {
ufs_panic (sb, "ufs_free_blocks", "freeing blocks are outside device"); ufs_panic (sb, "ufs_free_blocks", "freeing blocks are outside device");
goto failed; goto failed_unlock;
} }
end_bit = bit + count; end_bit = bit + count;
if (end_bit > uspi->s_fpg) { if (end_bit > uspi->s_fpg) {
@ -167,11 +167,11 @@ do_more:
ucpi = ufs_load_cylinder (sb, cgno); ucpi = ufs_load_cylinder (sb, cgno);
if (!ucpi) if (!ucpi)
goto failed; goto failed_unlock;
ucg = ubh_get_ucg (UCPI_UBH(ucpi)); ucg = ubh_get_ucg (UCPI_UBH(ucpi));
if (!ufs_cg_chkmagic(sb, ucg)) { if (!ufs_cg_chkmagic(sb, ucg)) {
ufs_panic (sb, "ufs_free_blocks", "internal error, bad magic number on cg %u", cgno); ufs_panic (sb, "ufs_free_blocks", "internal error, bad magic number on cg %u", cgno);
goto failed; goto failed_unlock;
} }
for (i = bit; i < end_bit; i += uspi->s_fpb) { for (i = bit; i < end_bit; i += uspi->s_fpb) {
@ -210,8 +210,9 @@ do_more:
UFSD("EXIT\n"); UFSD("EXIT\n");
return; return;
failed: failed_unlock:
unlock_super (sb); unlock_super (sb);
failed:
UFSD("EXIT (FAILED)\n"); UFSD("EXIT (FAILED)\n");
return; return;
} }