From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@infradead.org>,
Lukas Czerner <lczerner@redhat.com>, Theodore Tso <tytso@MIT.EDU>
Subject: linux-next: manual merge of the block tree with the ext4 tree
Date: Tue, 21 Sep 2010 14:04:10 +1000 [thread overview]
Message-ID: <20100921140410.f1ba148e.sfr@canb.auug.org.au> (raw)
Hi Jens,
Today's linux-next merge of the block tree got a conflict in
fs/ext4/mballoc.c between commit 9c543072a9dd7cf60cbf472914a6480ffda50b27
("ext4: Check for negative error code from sb_issue_discard") from the
ext4 tree and commit 2cf6d26a354ab6362e301b5a323832b02867df47 ("block:
pass gfp_mask and flags to sb_issue_discard") 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/ext4/mballoc.c
index e4f4dae,19aa0d4..0000000
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@@ -2612,8 -2566,8 +2612,8 @@@ static inline void ext4_issue_discard(s
discard_block = block + ext4_group_first_block_no(sb, block_group);
trace_ext4_discard_blocks(sb,
(unsigned long long) discard_block, count);
- ret = sb_issue_discard(sb, discard_block, count);
+ ret = sb_issue_discard(sb, discard_block, count, GFP_NOFS, 0);
- if (ret == EOPNOTSUPP) {
+ if (ret == -EOPNOTSUPP) {
ext4_warning(sb, "discard not supported, disabling");
clear_opt(EXT4_SB(sb)->s_mount_opt, DISCARD);
}
next reply other threads:[~2010-09-21 4:04 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-21 4:04 Stephen Rothwell [this message]
2010-10-23 2:47 ` linux-next: manual merge of the block tree with the ext4 tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-06-26 3:09 Stephen Rothwell
2023-06-26 8:00 ` Christoph Hellwig
2023-06-27 0:46 ` Stephen Rothwell
2023-06-13 2:54 Stephen Rothwell
2023-06-13 5:00 ` Christoph Hellwig
2016-07-15 4:33 Stephen Rothwell
2014-11-27 3:53 Stephen Rothwell
2014-11-27 7:38 ` Christoph Hellwig
2014-11-29 10:08 ` Sabrina Dubroca
2014-11-29 17:38 ` Theodore Ts'o
2014-11-29 22:08 ` Jeremiah Mahler
2014-11-26 2:41 Stephen Rothwell
2010-04-29 3:51 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=20100921140410.f1ba148e.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=axboe@kernel.dk \
--cc=hch@infradead.org \
--cc=lczerner@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tytso@MIT.EDU \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).