Commit b02383ea authored May 29, 2013 by Jens Axboe

Merge branch 'for-jens' of...

Merge branch 'for-jens' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/linux-block into for-linus

Jiri writes:

please pull from

  git://git.kernel.org/pub/scm/linux/kernel/git/jikos/linux-block.git for-jens

to receive one pktcdvd fix. It fixes a highly theoretical issue with using.
pktcdvd to work with media that'd be larger than 2TB :) But it's a correct.
fix and makes static checkers shut up about improperly cleaning upper.
32bits.

parents 1fbeeba3 10452966

drivers/block/pktcdvd.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,8 @@

		#define MAX_SPEED 0xffff

		#define ZONE(sector, pd) (((sector) + (pd)->offset) & ~((pd)->settings.size - 1))
		#define ZONE(sector, pd) (((sector) + (pd)->offset) & \
		~(sector_t)((pd)->settings.size - 1))

		static DEFINE_MUTEX(pktcdvd_mutex);
		static struct pktcdvd_device *pkt_devs[MAX_WRITERS];