redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

writeback: ensure that WB_SYNC_NONE writeback with sb pinned is sync 

Even if the writeout itself isn't a data integrity operation, we need
to ensure that the caller doesn't drop the sb umount sem before we
have actually done the writeback.

This is a fixup for commit e913fc82.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
hifive-unleashed-5.1
Jens Axboe 2010-05-18 14:29:29 +02:00
parent 2db4e42eac
commit 7c8a3554c6
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/fs-writeback.c
View File

@ -193,7 +193,8 @@ static void bdi_wait_on_work_clear(struct bdi_work *work)
} }
static void bdi_alloc_queue_work(struct backing_dev_info *bdi, static void bdi_alloc_queue_work(struct backing_dev_info *bdi,
struct wb_writeback_args *args) struct wb_writeback_args *args,
int wait)
{ {
struct bdi_work *work; struct bdi_work *work;
@ -205,6 +206,8 @@ static void bdi_alloc_queue_work(struct backing_dev_info *bdi,
if (work) { if (work) {
bdi_work_init(work, args); bdi_work_init(work, args);
bdi_queue_work(bdi, work); bdi_queue_work(bdi, work);
if (wait)
bdi_wait_on_work_clear(work);
} else { } else {
struct bdi_writeback *wb = &bdi->wb; struct bdi_writeback *wb = &bdi->wb;
@ -279,7 +282,7 @@ void bdi_start_writeback(struct backing_dev_info *bdi, struct super_block *sb,
args.for_background = 1; args.for_background = 1;
} }
bdi_alloc_queue_work(bdi, &args); bdi_alloc_queue_work(bdi, &args, sb_locked);
} }
/* /*
@ -909,6 +912,7 @@ long wb_do_writeback(struct bdi_writeback *wb, int force_wait)
while ((work = get_next_work_item(bdi, wb)) != NULL) { while ((work = get_next_work_item(bdi, wb)) != NULL) {
struct wb_writeback_args args = work->args; struct wb_writeback_args args = work->args;
int post_clear;
/* /*
* Override sync mode, in case we must wait for completion * Override sync mode, in case we must wait for completion
@ -916,11 +920,13 @@ long wb_do_writeback(struct bdi_writeback *wb, int force_wait)
if (force_wait) if (force_wait)
work->args.sync_mode = args.sync_mode = WB_SYNC_ALL; work->args.sync_mode = args.sync_mode = WB_SYNC_ALL;
post_clear = WB_SYNC_ALL || args.sb_pinned;
/* /*
* If this isn't a data integrity operation, just notify * If this isn't a data integrity operation, just notify
* that we have seen this work and we are now starting it. * that we have seen this work and we are now starting it.
*/ */
if (args.sync_mode == WB_SYNC_NONE) if (!post_clear)
wb_clear_pending(wb, work); wb_clear_pending(wb, work);
wrote += wb_writeback(wb, &args); wrote += wb_writeback(wb, &args);
@ -929,7 +935,7 @@ long wb_do_writeback(struct bdi_writeback *wb, int force_wait)
* This is a data integrity writeback, so only do the * This is a data integrity writeback, so only do the
* notification when we have completed the work. * notification when we have completed the work.
*/ */
if (args.sync_mode == WB_SYNC_ALL) if (post_clear)
wb_clear_pending(wb, work); wb_clear_pending(wb, work);
} }
@ -1000,7 +1006,7 @@ static void bdi_writeback_all(struct super_block *sb, long nr_pages)
if (!bdi_has_dirty_io(bdi)) if (!bdi_has_dirty_io(bdi))
continue; continue;
bdi_alloc_queue_work(bdi, &args); bdi_alloc_queue_work(bdi, &args, 0);
} }
rcu_read_unlock(); rcu_read_unlock();