On Tue, 3 Feb 2009, Andrew Morton wrote:
On Tue, 3 Feb 2009 11:23:03 +0300 (EAT) Dan Carpenter <error27@xxxxxxxxx> wrote:
This is jbd2_journal_begin_ordered_truncate() from fs/jbd2/transaction.c.
I think the "&&" is supposed to be an "||" on line 2144. Just knowing
that inode->i_transaction is NULL should be enough, otherwise we would
immediately dereference a null on line 2146.
2144 if (!inode->i_transaction && !inode->i_next_transaction)
2145 goto out;
2146 journal = inode->i_transaction->t_journal;
Could be. Hard to tell from the code, changelog and (non) comments. Perhaps
it's dead code.
Send a patch, become famous ;)
While you're there, rename local var `inode' to `jinode'.
Changed '&&' to '||' to avoid a potential NULL dereference.
Also renamed jbd2_inode *inode to jbd2_inode *jinode.
regards,
dan carpenter
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
--- orig/fs/jbd2/transaction.c 2009-02-03 11:49:52.000000000 +0300
+++ devel/fs/jbd2/transaction.c 2009-02-03 11:51:49.000000000 +0300
@@ -2134,21 +2134,21 @@
* case it is in the committing transaction so that we stand to ordered
* mode consistency guarantees.
*/
-int jbd2_journal_begin_ordered_truncate(struct jbd2_inode *inode,
+int jbd2_journal_begin_ordered_truncate(struct jbd2_inode *jinode,
loff_t new_size)
{
journal_t *journal;
transaction_t *commit_trans;
int ret = 0;
- if (!inode->i_transaction && !inode->i_next_transaction)
+ if (!jinode->i_transaction || !jinode->i_next_transaction)
goto out;
- journal = inode->i_transaction->t_journal;
+ journal = jinode->i_transaction->t_journal;
spin_lock(&journal->j_state_lock);
commit_trans = journal->j_committing_transaction;
spin_unlock(&journal->j_state_lock);
- if (inode->i_transaction == commit_trans) {
- ret = filemap_fdatawrite_range(inode->i_vfs_inode->i_mapping,
+ if (jinode->i_transaction == commit_trans) {
+ ret = filemap_fdatawrite_range(jinode->i_vfs_inode->i_mapping,
new_size, LLONG_MAX);
if (ret)
jbd2_journal_abort(journal, ret);
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
