git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
fs
/
jbd
/
commit.c
diff --git
a/fs/jbd/commit.c
b/fs/jbd/commit.c
index
9645163
..
c1eb3c5
100644
(file)
--- a/
fs/jbd/commit.c
+++ b/
fs/jbd/commit.c
@@
-362,7
+362,7
@@
write_out_data:
*/
commit_transaction->t_state = T_COMMIT;
*/
commit_transaction->t_state = T_COMMIT;
- descriptor =
NULL
;
+ descriptor =
0
;
bufs = 0;
while (commit_transaction->t_buffers) {
bufs = 0;
while (commit_transaction->t_buffers) {
@@
-503,7
+503,7
@@
write_out_data:
start_journal_io:
for (i = 0; i < bufs; i++) {
struct buffer_head *bh = wbuf[i];
start_journal_io:
for (i = 0; i < bufs; i++) {
struct buffer_head *bh = wbuf[i];
-
lock_buffer
(bh);
+
set_buffer_locked
(bh);
clear_buffer_dirty(bh);
set_buffer_uptodate(bh);
bh->b_end_io = journal_end_buffer_io_sync;
clear_buffer_dirty(bh);
set_buffer_uptodate(bh);
bh->b_end_io = journal_end_buffer_io_sync;
@@
-545,7
+545,6
@@
wait_for_iobuf:
wait_on_buffer(bh);
goto wait_for_iobuf;
}
wait_on_buffer(bh);
goto wait_for_iobuf;
}
- cond_resched();
if (unlikely(!buffer_uptodate(bh)))
err = -EIO;
if (unlikely(!buffer_uptodate(bh)))
err = -EIO;
@@
-600,7
+599,6
@@
wait_for_iobuf:
wait_on_buffer(bh);
goto wait_for_ctlbuf;
}
wait_on_buffer(bh);
goto wait_for_ctlbuf;
}
- cond_resched();
if (unlikely(!buffer_uptodate(bh)))
err = -EIO;
if (unlikely(!buffer_uptodate(bh)))
err = -EIO;
@@
-766,7
+764,6
@@
skip_commit: /* The journal should be unlocked by now. */
release_buffer_page(bh);
}
spin_unlock(&journal->j_list_lock);
release_buffer_page(bh);
}
spin_unlock(&journal->j_list_lock);
- cond_resched();
}
/* Done with this transaction! */
}
/* Done with this transaction! */