Skip to contentSkip to conversation

Patch "nbd: fix 64-bit division" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Apr 19, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

nbd: fix 64-bit division

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
nbd-fix-64-bit-division.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From e88f72cb9f54f6d244e55f629fe5e2f34ca6f9ed Mon Sep 17 00:00:00 2001

From: Jens Axboe <[email protected]>
Date: Sat, 3 Dec 2016 12:08:03 -0700
Subject: nbd: fix 64-bit division

From: Jens Axboe <[email protected]>

commit e88f72cb9f54f6d244e55f629fe5e2f34ca6f9ed upstream.

We have this:

ERROR: "__aeabi_ldivmod" [drivers/block/nbd.ko] undefined!
ERROR: "__divdi3" [drivers/block/nbd.ko] undefined! nbd.c:(.text+0x247c72): undefined reference to `__divdi3'

due to a recent commit, that did 64-bit division. Use the proper divider function so that 32-bit compiles don't break.

Fixes ef77b515243b ("nbd: use loff_t for blocksize and nbd_set_size args")
Cc Ben Hutchings <[email protected]>
---
 drivers/block/nbd.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/nbd.c +1 -1
@@ -648,7 +648,7 @@ static int __nbd_ioctl(struct block_devi
 
 	case NBD_SET_SIZE:
 		return nbd_size_set(nbd, bdev, nbd->blksize,
-				    arg / nbd->blksize);
+					div_s64(arg, nbd->blksize));
 
 	case NBD_SET_SIZE_BLOCKS:
 		return nbd_size_set(nbd, bdev, nbd->blksize, arg);

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/nbd-fix-64-bit-division.patch queue-4.9/nbd-use-loff_t-for-blocksize-and-nbd_set_size-args.patch