From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <jens.axboe@oracle•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jan Kara <jack@suse•cz>, Dmitry Monakhov <dmonakhov@openvz•org>
Subject: linux-next: manual merge of the block tree with the ext3 tree
Date: Fri, 30 Apr 2010 12:46:34 +1000 [thread overview]
Message-ID: <20100430124634.d474fce8.sfr@canb.auug.org.au> (raw)
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;
}
next reply other threads:[~2010-04-30 17:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-30 2:46 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-07-30 3:15 linux-next: manual merge of the block tree with the ext3 tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100430124634.d474fce8.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dmonakhov@openvz$(echo .)org \
--cc=jack@suse$(echo .)cz \
--cc=jens.axboe@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox