summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2009-09-09 21:32:41 -0400
committerTheodore Ts'o <tytso@mit.edu>2009-09-09 21:32:41 -0400
commitc7acb4c16646943180bd221c167a077e0a084f9c (patch)
treebb6f867bffc867b5c160fcb09e3054e66d7cf2f6 /fs
parent80e42468d65475e92651e62175bb7807773321d0 (diff)
downloadkernel-crypto-c7acb4c16646943180bd221c167a077e0a084f9c.tar.gz
kernel-crypto-c7acb4c16646943180bd221c167a077e0a084f9c.tar.xz
kernel-crypto-c7acb4c16646943180bd221c167a077e0a084f9c.zip
ext4: Use bforget() in no journal mode for ext4_journal_{forget,revoke}()
When ext4 is using a journal, a metadata block which is deallocated must be passed into the journal layer so it can be dropped from the current transaction and/or revoked. This is done by calling the functions ext4_journal_forget() and ext4_journal_revoke(), which call jbd2_journal_forget(), and jbd2_journal_revoke(), respectively. Since the jbd2_journal_forget() and jbd2_journal_revoke() call bforget(), if ext4 is not using a journal, ext4_journal_forget() and ext4_journal_revoke() must call bforget() to avoid a dirty metadata block overwriting a block after it has been reallocated and reused for another inode's data block. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/ext4_jbd2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c
index eb27fd0f2ee..ecb9ca455fd 100644
--- a/fs/ext4/ext4_jbd2.c
+++ b/fs/ext4/ext4_jbd2.c
@@ -44,7 +44,7 @@ int __ext4_journal_forget(const char *where, handle_t *handle,
handle, err);
}
else
- brelse(bh);
+ bforget(bh);
return err;
}
@@ -60,7 +60,7 @@ int __ext4_journal_revoke(const char *where, handle_t *handle,
handle, err);
}
else
- brelse(bh);
+ bforget(bh);
return err;
}