Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 229079
b: refs/heads/master
c: fbcae8e
h: refs/heads/master
i:
  229077: b8468ce
  229075: 5303d75
  229071: 7b582d7
v: v3
  • Loading branch information
Namhyung Kim authored and Jan Kara committed Jan 6, 2011
1 parent 7271925 commit c4f04c4
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 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: 2b543edae2d9161ae8dda1d85cbd28ef8a166cc0
refs/heads/master: fbcae8e32d73ad6cad9c5721881350c51174d552
14 changes: 12 additions & 2 deletions trunk/fs/ext3/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -1644,8 +1644,13 @@ static int ext3_delete_entry (handle_t *handle,
if (!ext3_check_dir_entry("ext3_delete_entry", dir, de, bh, i))
return -EIO;
if (de == de_del) {
int err;

BUFFER_TRACE(bh, "get_write_access");
ext3_journal_get_write_access(handle, bh);
err = ext3_journal_get_write_access(handle, bh);
if (err)
goto journal_error;

if (pde)
pde->rec_len = ext3_rec_len_to_disk(
ext3_rec_len_from_disk(pde->rec_len) +
Expand All @@ -1654,7 +1659,12 @@ static int ext3_delete_entry (handle_t *handle,
de->inode = 0;
dir->i_version++;
BUFFER_TRACE(bh, "call ext3_journal_dirty_metadata");
ext3_journal_dirty_metadata(handle, bh);
err = ext3_journal_dirty_metadata(handle, bh);
if (err) {
journal_error:
ext3_std_error(dir->i_sb, err);
return err;
}
return 0;
}
i += ext3_rec_len_from_disk(de->rec_len);
Expand Down

0 comments on commit c4f04c4

Please sign in to comment.