linux-kernel - linux-next: manual merge of the block tree with the ext4 tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 21 Sep 2010 14:04:10 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jens Axboe <axboe@...nel.dk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Christoph Hellwig <hch@...radead.org>,
	Lukas Czerner <lczerner@...hat.com>,
	Theodore Tso <tytso@....EDU>
Subject: linux-next: manual merge of the block tree with the ext4 tree

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@...b.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);
  	}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/