OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ext3: Use WRITE_SYNC for commits which are caused by fsync() 

If a commit is triggered by fsync(), set a flag indicating the journal
blocks associated with the transaction should be flushed out using
WRITE_SYNC.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Acked-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Theodore Ts'o 2009-03-27 22:14:27 -04:00
parent a64c8610bd
commit 512a004382
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fs/jbd/commit.c
View File

@ -20,6 +20,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/bio.h>
/* /*
* Default IO end handler for temporary BJ_IO buffer_heads. * Default IO end handler for temporary BJ_IO buffer_heads.
@ -171,14 +172,15 @@ static int journal_write_commit_record(journal_t *journal,
return (ret == -EIO); return (ret == -EIO);
} }
static void journal_do_submit_data(struct buffer_head **wbuf, int bufs) static void journal_do_submit_data(struct buffer_head **wbuf, int bufs,
int write_op)
{ {
int i; int i;
for (i = 0; i < bufs; i++) { for (i = 0; i < bufs; i++) {
wbuf[i]->b_end_io = end_buffer_write_sync; wbuf[i]->b_end_io = end_buffer_write_sync;
/* We use-up our safety reference in submit_bh() */ /* We use-up our safety reference in submit_bh() */
submit_bh(WRITE, wbuf[i]); submit_bh(write_op, wbuf[i]);
} }
} }
@ -186,7 +188,8 @@ static void journal_do_submit_data(struct buffer_head **wbuf, int bufs)
* Submit all the data buffers to disk * Submit all the data buffers to disk
*/ */
static int journal_submit_data_buffers(journal_t *journal, static int journal_submit_data_buffers(journal_t *journal,
transaction_t *commit_transaction) transaction_t *commit_transaction,
int write_op)
{ {
struct journal_head *jh; struct journal_head *jh;
struct buffer_head *bh; struct buffer_head *bh;
@ -225,7 +228,7 @@ write_out_data:
BUFFER_TRACE(bh, "needs blocking lock"); BUFFER_TRACE(bh, "needs blocking lock");
spin_unlock(&journal->j_list_lock); spin_unlock(&journal->j_list_lock);
/* Write out all data to prevent deadlocks */ /* Write out all data to prevent deadlocks */
journal_do_submit_data(wbuf, bufs); journal_do_submit_data(wbuf, bufs, write_op);
bufs = 0; bufs = 0;
lock_buffer(bh); lock_buffer(bh);
spin_lock(&journal->j_list_lock); spin_lock(&journal->j_list_lock);
@ -256,7 +259,7 @@ write_out_data:
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
if (bufs == journal->j_wbufsize) { if (bufs == journal->j_wbufsize) {
spin_unlock(&journal->j_list_lock); spin_unlock(&journal->j_list_lock);
journal_do_submit_data(wbuf, bufs); journal_do_submit_data(wbuf, bufs, write_op);
bufs = 0; bufs = 0;
goto write_out_data; goto write_out_data;
} }
@ -286,7 +289,7 @@ write_out_data:
} }
} }
spin_unlock(&journal->j_list_lock); spin_unlock(&journal->j_list_lock);
journal_do_submit_data(wbuf, bufs); journal_do_submit_data(wbuf, bufs, write_op);
return err; return err;
} }
@ -315,6 +318,7 @@ void journal_commit_transaction(journal_t *journal)
int first_tag = 0; int first_tag = 0;
int tag_flag; int tag_flag;
int i; int i;
int write_op = WRITE;
/* /*
* First job: lock down the current transaction and wait for * First job: lock down the current transaction and wait for
@ -347,6 +351,8 @@ void journal_commit_transaction(journal_t *journal)
spin_lock(&journal->j_state_lock); spin_lock(&journal->j_state_lock);
commit_transaction->t_state = T_LOCKED; commit_transaction->t_state = T_LOCKED;
if (commit_transaction->t_synchronous_commit)
write_op = WRITE_SYNC;
spin_lock(&commit_transaction->t_handle_lock); spin_lock(&commit_transaction->t_handle_lock);
while (commit_transaction->t_updates) { while (commit_transaction->t_updates) {
DEFINE_WAIT(wait); DEFINE_WAIT(wait);
@ -431,7 +437,8 @@ void journal_commit_transaction(journal_t *journal)
* Now start flushing things to disk, in the order they appear * Now start flushing things to disk, in the order they appear
* on the transaction lists. Data blocks go first. * on the transaction lists. Data blocks go first.
*/ */
err = journal_submit_data_buffers(journal, commit_transaction); err = journal_submit_data_buffers(journal, commit_transaction,
write_op);
/* /*
* Wait for all previously submitted IO to complete. * Wait for all previously submitted IO to complete.
@ -660,7 +667,7 @@ start_journal_io:
clear_buffer_dirty(bh); clear_buffer_dirty(bh);
set_buffer_uptodate(bh); set_buffer_uptodate(bh);
bh->b_end_io = journal_end_buffer_io_sync; bh->b_end_io = journal_end_buffer_io_sync;
submit_bh(WRITE, bh); submit_bh(write_op, bh);
} }
cond_resched(); cond_resched();

2
fs/jbd/transaction.c
View File

@ -1440,6 +1440,8 @@ int journal_stop(handle_t *handle)
} }
} }
if (handle->h_sync)
transaction->t_synchronous_commit = 1;
current->journal_info = NULL; current->journal_info = NULL;
spin_lock(&journal->j_state_lock); spin_lock(&journal->j_state_lock);
spin_lock(&transaction->t_handle_lock); spin_lock(&transaction->t_handle_lock);

5
include/linux/jbd.h
View File

@ -552,6 +552,11 @@ struct transaction_s
*/ */
int t_handle_count; int t_handle_count;
/*
* This transaction is being forced and some process is
* waiting for it to finish.
*/
int t_synchronous_commit:1;
}; };
/** /**