From 74a4705a993ce475d95c1c20d0cc4eb740b0c933 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Thu, 14 Jul 2016 15:29:09 +0200 Subject: Add sizelimit to internal API Fully safe checks of loop device need to check sizelimit. To prevent need of two nearly equal functions, introduce sizelimit parameter to several internal functions: loopdev_is_used() loopdev_find_by_backing_file() loopcxt_is_used() loopcxt_find_by_backing_file() If sizelimit is zero, fall back to the old behavior (ignoring of sizelimit). Signed-off-by: Stanislav Brabec --- sys-utils/losetup.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sys-utils/losetup.c') diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c index 2ae6ace27..d9c75b9e0 100644 --- a/sys-utils/losetup.c +++ b/sys-utils/losetup.c @@ -178,10 +178,10 @@ static int show_all_loops(struct loopdev_cxt *lc, const char *file, int used; const char *bf = cn_file ? cn_file : file; - used = loopcxt_is_used(lc, st, bf, offset, flags); + used = loopcxt_is_used(lc, st, bf, offset, 0, flags); if (!used && !cn_file) { bf = cn_file = canonicalize_path(file); - used = loopcxt_is_used(lc, st, bf, offset, flags); + used = loopcxt_is_used(lc, st, bf, offset, 0, flags); } if (!used) continue; @@ -344,10 +344,10 @@ static int show_table(struct loopdev_cxt *lc, int used; const char *bf = cn_file ? cn_file : file; - used = loopcxt_is_used(lc, st, bf, offset, flags); + used = loopcxt_is_used(lc, st, bf, offset, 0, flags); if (!used && !cn_file) { bf = cn_file = canonicalize_path(file); - used = loopcxt_is_used(lc, st, bf, offset, flags); + used = loopcxt_is_used(lc, st, bf, offset, 0, flags); } if (!used) continue; -- cgit v1.2.3-55-g7522