Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 29679
b: refs/heads/master
c: 2e00639
h: refs/heads/master
i:
  29677: 93fad0d
  29675: 17ead4c
  29671: 5c41630
  29663: 7f4d897
v: v3
  • Loading branch information
Evgeniy Dushistov authored and Linus Torvalds committed Jun 25, 2006
1 parent d06be2b commit 2ca1219
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 50aa4eb0b978f4a0283471c776ed812269ac8af5
refs/heads/master: 2e006393ba5b599d9c43f94f8d8989e68131433e
9 changes: 5 additions & 4 deletions trunk/fs/ufs/balloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ void ufs_free_blocks(struct inode *inode, unsigned fragment, unsigned count)
bit = ufs_dtogd (fragment);
if (cgno >= uspi->s_ncg) {
ufs_panic (sb, "ufs_free_blocks", "freeing blocks are outside device");
goto failed;
goto failed_unlock;
}
end_bit = bit + count;
if (end_bit > uspi->s_fpg) {
Expand All @@ -167,11 +167,11 @@ void ufs_free_blocks(struct inode *inode, unsigned fragment, unsigned count)

ucpi = ufs_load_cylinder (sb, cgno);
if (!ucpi)
goto failed;
goto failed_unlock;
ucg = ubh_get_ucg (UCPI_UBH(ucpi));
if (!ufs_cg_chkmagic(sb, ucg)) {
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) {
Expand Down Expand Up @@ -210,8 +210,9 @@ void ufs_free_blocks(struct inode *inode, unsigned fragment, unsigned count)
UFSD("EXIT\n");
return;

failed:
failed_unlock:
unlock_super (sb);
failed:
UFSD("EXIT (FAILED)\n");
return;
}
Expand Down

0 comments on commit 2ca1219

Please sign in to comment.