From efdfcc9e9503d03acf6b3adb47f34173f7112afe Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Fri, 4 Mar 2016 16:49:38 -0500 Subject: [PATCH] Grow: Grow_addbitmap(): Add check to quiet down static code checkers Grow_addbitmap() is only ever called with s->bitmap_file != NULL, but not all static code checkers catch this. This adds a check to quiet down the false positive warnings. Reviewed-by: NeilBrown Signed-off-by: Jes Sorensen --- Grow.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Grow.c b/Grow.c index c4af5c0..cf2750a 100755 --- a/Grow.c +++ b/Grow.c @@ -297,7 +297,14 @@ int Grow_addbitmap(char *devname, int fd, struct context *c, struct shape *s) " between different architectures. Consider upgrading the Linux kernel.\n"); } - if (s->bitmap_file && strcmp(s->bitmap_file, "clustered") == 0) + /* + * We only ever get called if s->bitmap_file is != NULL, so this check + * is just here to quiet down static code checkers. + */ + if (!s->bitmap_file) + return 1; + + if (strcmp(s->bitmap_file, "clustered") == 0) major = BITMAP_MAJOR_CLUSTERED; if (ioctl(fd, GET_BITMAP_FILE, &bmf) != 0) {