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
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
fs
/
reiserfs
/
journal.c
diff --git
a/fs/reiserfs/journal.c
b/fs/reiserfs/journal.c
index
9b3672d
..
1b73529
100644
(file)
--- a/
fs/reiserfs/journal.c
+++ b/
fs/reiserfs/journal.c
@@
-34,6
+34,7
@@
** from within kupdate, it will ignore the immediate flag
*/
** from within kupdate, it will ignore the immediate flag
*/
+#include <linux/config.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/system.h>
@@
-833,7
+834,8
@@
static int write_ordered_buffers(spinlock_t * lock,
get_bh(bh);
if (test_set_buffer_locked(bh)) {
if (!buffer_dirty(bh)) {
get_bh(bh);
if (test_set_buffer_locked(bh)) {
if (!buffer_dirty(bh)) {
- list_move(&jh->list, &tmp);
+ list_del_init(&jh->list);
+ list_add(&jh->list, &tmp);
goto loop_next;
}
spin_unlock(lock);
goto loop_next;
}
spin_unlock(lock);
@@
-853,7
+855,8
@@
static int write_ordered_buffers(spinlock_t * lock,
ret = -EIO;
}
if (buffer_dirty(bh)) {
ret = -EIO;
}
if (buffer_dirty(bh)) {
- list_move(&jh->list, &tmp);
+ list_del_init(&jh->list);
+ list_add(&jh->list, &tmp);
add_to_chunk(&chunk, bh, lock, write_ordered_chunk);
} else {
reiserfs_free_jh(bh);
add_to_chunk(&chunk, bh, lock, write_ordered_chunk);
} else {
reiserfs_free_jh(bh);