Skip to content

Commit

Permalink
dm log: add flush_header function
Browse files Browse the repository at this point in the history
Introduce flush_header and use it to flush the log device.

Note that we don't have to flush if all the regions transition
from "dirty" to "clean" state.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
  • Loading branch information
Mikulas Patocka authored and Alasdair G Kergon committed Dec 10, 2009
1 parent b09acf1 commit 20a34a8
Showing 1 changed file with 22 additions and 1 deletion.
23 changes: 22 additions & 1 deletion drivers/md/dm-log.c
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,19 @@ static int rw_header(struct log_c *lc, int rw)
return dm_io(&lc->io_req, 1, &lc->header_location, NULL);
}

static int flush_header(struct log_c *lc)
{
struct dm_io_region null_location = {
.bdev = lc->header_location.bdev,
.sector = 0,
.count = 0,
};

lc->io_req.bi_rw = WRITE_BARRIER;

return dm_io(&lc->io_req, 1, &null_location, NULL);
}

static int read_header(struct log_c *log)
{
int r;
Expand Down Expand Up @@ -616,6 +629,8 @@ static int disk_resume(struct dm_dirty_log *log)

/* write the new header */
r = rw_header(lc, WRITE);
if (!r)
r = flush_header(lc);
if (r) {
DMWARN("%s: Failed to write header on dirty region log device",
lc->log_dev->name);
Expand Down Expand Up @@ -669,7 +684,13 @@ static int disk_flush(struct dm_dirty_log *log)
if (r)
fail_log_device(lc);
else {
lc->touched_dirtied = 0;
if (lc->touched_dirtied) {
r = flush_header(lc);
if (r)
fail_log_device(lc);
else
lc->touched_dirtied = 0;
}
lc->touched_cleaned = 0;
}

Expand Down

0 comments on commit 20a34a8

Please sign in to comment.