From 0d5a9a777adfb014ff04830d3bdc249561233e88 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin Date: Fri, 8 Apr 2016 18:09:23 +0300 Subject: [PATCH] LU-7220 llog: fix fd lost and correct error reporting A file descriptor acquired to 'fd' may be lost in case of error in is_fstype_ext() function. Fix error code of is_fstype_ext() propagation. Change-Id: I0894cfad83854c503e2cdcfff78d44f6f2746ef3 Signed-off-by: Dmitry Eremin Reviewed-on: http://review.whamcloud.com/19407 Tested-by: Maloo Reviewed-by: Bob Glossman Reviewed-by: John L. Hammond Tested-by: Jenkins Reviewed-by: Oleg Drokin --- lustre/utils/llog_reader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lustre/utils/llog_reader.c b/lustre/utils/llog_reader.c index 1c862d7..c5922c1 100644 --- a/lustre/utils/llog_reader.c +++ b/lustre/utils/llog_reader.c @@ -186,9 +186,10 @@ int main(int argc, char **argv) is_ext = is_fstype_ext(fd); if (is_ext < 0) { + rc = is_ext; printf("Unable to determine type of filesystem containing %s\n", argv[1]); - goto out; + goto out_fd; } rc = llog_pack_buffer(fd, &llog_buf, &recs_buf, &rec_number); -- 1.8.3.1