aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeniy Dushistov <dushistov@mail.ru>2006-06-25 08:47:26 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 13:01:03 -0400
commit2e006393ba5b599d9c43f94f8d8989e68131433e (patch)
tree541161158464b388db66093ec9eb25425b0e2d5e
parent50aa4eb0b978f4a0283471c776ed812269ac8af5 (diff)
[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>
-rw-r--r--fs/ufs/balloc.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c
index 62193db34346..ac709e70f646 100644
--- a/fs/ufs/balloc.c
+++ b/fs/ufs/balloc.c
@@ -156,7 +156,7 @@ do_more:
156 bit = ufs_dtogd (fragment); 156 bit = ufs_dtogd (fragment);
157 if (cgno >= uspi->s_ncg) { 157 if (cgno >= uspi->s_ncg) {
158 ufs_panic (sb, "ufs_free_blocks", "freeing blocks are outside device"); 158 ufs_panic (sb, "ufs_free_blocks", "freeing blocks are outside device");
159 goto failed; 159 goto failed_unlock;
160 } 160 }
161 end_bit = bit + count; 161 end_bit = bit + count;
162 if (end_bit > uspi->s_fpg) { 162 if (end_bit > uspi->s_fpg) {
@@ -167,11 +167,11 @@ do_more:
167 167
168 ucpi = ufs_load_cylinder (sb, cgno); 168 ucpi = ufs_load_cylinder (sb, cgno);
169 if (!ucpi) 169 if (!ucpi)
170 goto failed; 170 goto failed_unlock;
171 ucg = ubh_get_ucg (UCPI_UBH(ucpi)); 171 ucg = ubh_get_ucg (UCPI_UBH(ucpi));
172 if (!ufs_cg_chkmagic(sb, ucg)) { 172 if (!ufs_cg_chkmagic(sb, ucg)) {
173 ufs_panic (sb, "ufs_free_blocks", "internal error, bad magic number on cg %u", cgno); 173 ufs_panic (sb, "ufs_free_blocks", "internal error, bad magic number on cg %u", cgno);
174 goto failed; 174 goto failed_unlock;
175 } 175 }
176 176
177 for (i = bit; i < end_bit; i += uspi->s_fpb) { 177 for (i = bit; i < end_bit; i += uspi->s_fpb) {
@@ -210,8 +210,9 @@ do_more:
210 UFSD("EXIT\n"); 210 UFSD("EXIT\n");
211 return; 211 return;
212 212
213failed: 213failed_unlock:
214 unlock_super (sb); 214 unlock_super (sb);
215failed:
215 UFSD("EXIT (FAILED)\n"); 216 UFSD("EXIT (FAILED)\n");
216 return; 217 return;
217} 218}