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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
jbd
/
commit.c
diff --git
a/fs/jbd/commit.c
b/fs/jbd/commit.c
index
e998a60
..
be4648b
100644
(file)
--- a/
fs/jbd/commit.c
+++ b/
fs/jbd/commit.c
@@
-1,5
+1,5
@@
/*
/*
- * linux/fs/commit.c
+ * linux/fs/
jbd/
commit.c
*
* Written by Stephen C. Tweedie <sct@redhat.com>, 1998
*
*
* Written by Stephen C. Tweedie <sct@redhat.com>, 1998
*
@@
-160,7
+160,7
@@
static int journal_write_commit_record(journal_t *journal,
return (ret == -EIO);
}
return (ret == -EIO);
}
-void journal_do_submit_data(struct buffer_head **wbuf, int bufs)
+
static
void journal_do_submit_data(struct buffer_head **wbuf, int bufs)
{
int i;
{
int i;
@@
-248,8
+248,12
@@
write_out_data:
bufs = 0;
goto write_out_data;
}
bufs = 0;
goto write_out_data;
}
- }
- else {
+ } else if (!locked && buffer_locked(bh)) {
+ __journal_file_buffer(jh, commit_transaction,
+ BJ_Locked);
+ jbd_unlock_bh_state(bh);
+ put_bh(bh);
+ } else {
BUFFER_TRACE(bh, "writeout complete: unfile");
__journal_unfile_buffer(jh);
jbd_unlock_bh_state(bh);
BUFFER_TRACE(bh, "writeout complete: unfile");
__journal_unfile_buffer(jh);
jbd_unlock_bh_state(bh);