diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-05-29 21:21:23 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-05-29 21:21:23 +0200 |
| commit | b02383ea202a70ba67ceb11354f38e6ab07265b9 (patch) | |
| tree | e2413e3197e0572c1462deff1a4010757090f99b /drivers/block | |
| parent | 1fbeeba35e1a25f1a7598e0f5d1433c18084e96a (diff) | |
| parent | 104529661b645295903c5007ae632d2dd4029254 (diff) | |
| download | linux-3.10-b02383ea202a70ba67ceb11354f38e6ab07265b9.tar.gz linux-3.10-b02383ea202a70ba67ceb11354f38e6ab07265b9.tar.bz2 linux-3.10-b02383ea202a70ba67ceb11354f38e6ab07265b9.zip | |
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.
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/pktcdvd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 3c08983e600..f5d0ea11d9f 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c @@ -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]; |