Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 242279
b: refs/heads/master
c: 2ed1a6b
h: refs/heads/master
i:
  242277: 240243e
  242275: 9265d77
  242271: 066a1ca
v: v3
  • Loading branch information
Jens Axboe committed Mar 10, 2011
1 parent 197443b commit 24e90a8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5b417b1873694ece3291d7f64a943304559a817b
refs/heads/master: 2ed1a6bcf97a7ed787e6799bf2e80b9e6f51dca7
8 changes: 8 additions & 0 deletions trunk/fs/mpage.c
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,9 @@ mpage_readpages(struct address_space *mapping, struct list_head *pages,
sector_t last_block_in_bio = 0;
struct buffer_head map_bh;
unsigned long first_logical_block = 0;
struct blk_plug plug;

blk_start_plug(&plug);

map_bh.b_state = 0;
map_bh.b_size = 0;
Expand All @@ -385,6 +388,7 @@ mpage_readpages(struct address_space *mapping, struct list_head *pages,
BUG_ON(!list_empty(pages));
if (bio)
mpage_bio_submit(READ, bio);
blk_finish_plug(&plug);
return 0;
}
EXPORT_SYMBOL(mpage_readpages);
Expand Down Expand Up @@ -666,8 +670,11 @@ int
mpage_writepages(struct address_space *mapping,
struct writeback_control *wbc, get_block_t get_block)
{
struct blk_plug plug;
int ret;

blk_start_plug(&plug);

if (!get_block)
ret = generic_writepages(mapping, wbc);
else {
Expand All @@ -682,6 +689,7 @@ mpage_writepages(struct address_space *mapping,
if (mpd.bio)
mpage_bio_submit(WRITE, mpd.bio);
}
blk_finish_plug(&plug);
return ret;
}
EXPORT_SYMBOL(mpage_writepages);
Expand Down

0 comments on commit 24e90a8

Please sign in to comment.