summaryrefslogtreecommitdiffstats
path: root/libfdisk/src/alignment.c
diff options
context:
space:
mode:
authorKarel Zak2014-09-01 14:42:12 +0200
committerKarel Zak2014-09-01 14:42:12 +0200
commitee50336c0365785273b2ea5f62cf4e41b7983a59 (patch)
treee5d3d509e14c7a3d534ab9a0b8241e13dd34cf4b /libfdisk/src/alignment.c
parentlibfdisk: rename fdisk_dump_ to fdisk_script_ (diff)
downloadkernel-qcow2-util-linux-ee50336c0365785273b2ea5f62cf4e41b7983a59.tar.gz
kernel-qcow2-util-linux-ee50336c0365785273b2ea5f62cf4e41b7983a59.tar.xz
kernel-qcow2-util-linux-ee50336c0365785273b2ea5f62cf4e41b7983a59.zip
libfdisk: (gpt) don't align last possible LBA
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libfdisk/src/alignment.c')
-rw-r--r--libfdisk/src/alignment.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/libfdisk/src/alignment.c b/libfdisk/src/alignment.c
index 9e1e722c8..22be7a106 100644
--- a/libfdisk/src/alignment.c
+++ b/libfdisk/src/alignment.c
@@ -106,15 +106,25 @@ sector_t fdisk_align_lba(struct fdisk_context *cxt, sector_t lba, int direction)
sector_t fdisk_align_lba_in_range(struct fdisk_context *cxt,
sector_t lba, sector_t start, sector_t stop)
{
+ sector_t res;
+
start = fdisk_align_lba(cxt, start, FDISK_ALIGN_UP);
stop = fdisk_align_lba(cxt, stop, FDISK_ALIGN_DOWN);
lba = fdisk_align_lba(cxt, lba, FDISK_ALIGN_NEAREST);
if (lba < start)
- return start;
+ res = start;
else if (lba > stop)
- return stop;
- return lba;
+ res = stop;
+ else
+ res = lba;
+
+ DBG(CXT, ul_debugobj(cxt, "LBA %ju range:<%ju..%ju>, result: %ju",
+ (uintmax_t) lba,
+ (uintmax_t) start,
+ (uintmax_t) stop,
+ (uintmax_t) res));
+ return res;
}
/**