diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-04-08 11:43:30 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-04-08 11:43:30 +0200 |
| commit | 529801898b24544f93532217ce18a7ebbb2b8c4f (patch) | |
| tree | c51c8fd808e6cff15cabb1a9ac29be0661942384 /block/blk-flush.c | |
| parent | b847d0501afec4c7b12eb276aec10a2834f953ea (diff) | |
| parent | 23995bbee01d75f09f72b1380bd6045a5b02947b (diff) | |
Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core
Pull IBM zEnterprise EC12 support patchlet from Robert Richter.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'block/blk-flush.c')
| -rw-r--r-- | block/blk-flush.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-flush.c b/block/blk-flush.c index db8f1b507857..cc2b827a853c 100644 --- a/block/blk-flush.c +++ b/block/blk-flush.c @@ -444,7 +444,7 @@ int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask, * copied from blk_rq_pos(rq). */ if (error_sector) - *error_sector = bio->bi_sector; + *error_sector = bio->bi_sector; if (!bio_flagged(bio, BIO_UPTODATE)) ret = -EIO; |