linux-kernel - linux-next: manual merge of the staging tree with the block 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]

Message-Id: <20111004171415.db52e4eb5c913afeba0a3bee@canb.auug.org.au>
Date:	Tue, 4 Oct 2011 17:14:15 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Christoph Hellwig <hch@...radead.org>,
	Jens Axboe <jaxboe@...ionio.com>,
	Jerome Marchand <jmarchan@...hat.com>
Subject: linux-next: manual merge of the staging tree with the block tree

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/zram/zram_drv.c between commit 5a7bbad27a41 ("block:
remove support for bio remapping from ->make_request") from the block
tree and commit 0900beae178a ("staging: zram: fix zram locking") from the
staging tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/staging/zram/zram_drv.c
index 02589ca,b9926ee..0000000
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@@ -572,9 -573,18 +573,17 @@@ static void zram_make_request(struct re
  	}
  
  	__zram_make_request(zram, bio, bio_data_dir(bio));
+ 	up_read(&zram->init_lock);
+ 
 -	return 0;
++	return;
+ 
+ error_unlock:
+ 	up_read(&zram->init_lock);
+ error:
+ 	bio_io_error(bio);
 -	return 0;
  }
  
- void zram_reset_device(struct zram *zram)
+ void __zram_reset_device(struct zram *zram)
  {
  	size_t index;
  

Content of type "application/pgp-signature" skipped