mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
remove SWRITE* I/O types
These flags aren't real I/O types, but tell ll_rw_block to always lock the buffer instead of giving up on a failed trylock. Instead add a new write_dirty_buffer helper that implements this semantic and use it from the existing SWRITE* callers. Note that the ll_rw_block code had a bug where it didn't promote WRITE_SYNC_PLUG properly, which this patch fixes. In the ufs code clean up the helper that used to call ll_rw_block to mirror sync_dirty_buffer, which is the function it implements for compound buffers. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Al Viro <[email protected]>
This commit is contained in:
parent
87e99511ea
commit
9cb569d601
16 changed files with 73 additions and 94 deletions
|
|
@ -254,7 +254,9 @@ __flush_batch(journal_t *journal, struct buffer_head **bhs, int *batch_count)
|
|||
{
|
||||
int i;
|
||||
|
||||
ll_rw_block(SWRITE, *batch_count, bhs);
|
||||
for (i = 0; i < *batch_count; i++)
|
||||
write_dirty_buffer(bhs[i], WRITE);
|
||||
|
||||
for (i = 0; i < *batch_count; i++) {
|
||||
struct buffer_head *bh = bhs[i];
|
||||
clear_buffer_jwrite(bh);
|
||||
|
|
|
|||
|
|
@ -1024,7 +1024,7 @@ void journal_update_superblock(journal_t *journal, int wait)
|
|||
if (wait)
|
||||
sync_dirty_buffer(bh);
|
||||
else
|
||||
ll_rw_block(SWRITE, 1, &bh);
|
||||
write_dirty_buffer(bh, WRITE);
|
||||
|
||||
out:
|
||||
/* If we have just flushed the log (by marking s_start==0), then
|
||||
|
|
|
|||
|
|
@ -617,7 +617,7 @@ static void flush_descriptor(journal_t *journal,
|
|||
set_buffer_jwrite(bh);
|
||||
BUFFER_TRACE(bh, "write");
|
||||
set_buffer_dirty(bh);
|
||||
ll_rw_block((write_op == WRITE) ? SWRITE : SWRITE_SYNC_PLUG, 1, &bh);
|
||||
write_dirty_buffer(bh, write_op);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue