* linux-next: manual merge of the block tree with the ext3 tree
@ 2010-04-30 2:46 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2010-04-30 2:46 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-next, linux-kernel, Jan Kara, Dmitry Monakhov
Hi Jens,
Today's linux-next merge of the block tree got a conflict in
fs/ext3/fsync.c between commit a74302d5d82ff478822c49b8345312b6fd5c6e0a
("ext3: Fix waiting on transaction during fsync") from the ext3 tree and
commit fbd9b09a177a481eda256447c881f014f29034fe ("blkdev: generalize
flags for blkdev_issue_fn functions") from the block tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc fs/ext3/fsync.c
index 26289e8,9492f60..0000000
--- a/fs/ext3/fsync.c
+++ b/fs/ext3/fsync.c
@@@ -89,7 -90,9 +89,8 @@@ int ext3_sync_file(struct file * file,
* disk caches manually so that data really is on persistent
* storage
*/
- if (test_opt(inode->i_sb, BARRIER))
+ if (needs_barrier)
- blkdev_issue_flush(inode->i_sb->s_bdev, NULL);
+ blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL,
+ BLKDEV_IFL_WAIT);
-out:
return ret;
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the block tree with the ext3 tree
@ 2015-07-30 3:15 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2015-07-30 3:15 UTC (permalink / raw)
To: Jens Axboe, Jan Kara; +Cc: linux-next, linux-kernel
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
block/bounce.c
between commit:
a3ad0a9da863 ("block: Remove forced page bouncing under IO")
from the ext3 tree and commit:
b7c44ed9d2fc ("block: manipulate bio->bi_flags through helpers")
from the block tree.
I fixed it up (the former removed some of the code updated by the latter)
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc block/bounce.c
index 31cad13a0c9d,2c310ea007ee..000000000000
--- a/block/bounce.c
+++ b/block/bounce.c
@@@ -160,24 -161,42 +161,24 @@@ static void __bounce_end_io_read(struc
{
struct bio *bio_orig = bio->bi_private;
- if (test_bit(BIO_UPTODATE, &bio->bi_flags))
+ if (!bio->bi_error)
copy_to_high_bio_irq(bio_orig, bio);
- bounce_end_io(bio, pool, err);
+ bounce_end_io(bio, pool);
}
- static void bounce_end_io_read(struct bio *bio, int err)
+ static void bounce_end_io_read(struct bio *bio)
{
- __bounce_end_io_read(bio, page_pool, err);
+ __bounce_end_io_read(bio, page_pool);
}
- static void bounce_end_io_read_isa(struct bio *bio, int err)
+ static void bounce_end_io_read_isa(struct bio *bio)
{
- __bounce_end_io_read(bio, isa_page_pool, err);
+ __bounce_end_io_read(bio, isa_page_pool);
}
-#ifdef CONFIG_NEED_BOUNCE_POOL
-static int must_snapshot_stable_pages(struct request_queue *q, struct bio *bio)
-{
- if (bio_data_dir(bio) != WRITE)
- return 0;
-
- if (!bdi_cap_stable_pages_required(&q->backing_dev_info))
- return 0;
-
- return bio_flagged(bio, BIO_SNAP_STABLE);
-}
-#else
-static int must_snapshot_stable_pages(struct request_queue *q, struct bio *bio)
-{
- return 0;
-}
-#endif /* CONFIG_NEED_BOUNCE_POOL */
-
static void __blk_queue_bounce(struct request_queue *q, struct bio **bio_orig,
- mempool_t *pool, int force)
+ mempool_t *pool)
{
struct bio *bio;
int rw = bio_data_dir(*bio_orig);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-07-30 3:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-30 3:15 linux-next: manual merge of the block tree with the ext3 tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2010-04-30 2:46 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox