nilfs2: avoid double error caused by nilfs_transaction_end

[safe/jmp/linux-2.6] / fs / nilfs2 / mdt.c

diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c
index 6ab8475..e0a632b 100644 (file)
--- a/fs/nilfs2/mdt.c
+++ b/fs/nilfs2/mdt.c
@@ -123,7 +123,10 @@ static int nilfs_mdt_create_block(struct inode *inode, unsigned long block,
        brelse(bh);
 
  failed_unlock:
-       nilfs_transaction_end(sb, !err);
+       if (likely(!err))
+               err = nilfs_transaction_commit(sb);
+       else
+               nilfs_transaction_abort(sb);
        if (writer)
                nilfs_put_writer(nilfs);
  out: