From bae40eaa96a22868440a6d0b680513b19fc9c565 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 8 Jul 2011 14:15:56 -0700 Subject: [PATCH] filejournal: parse kernel version 3.0+ Signed-off-by: Sage Weil --- src/os/FileJournal.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc index d6e3a0a2a3302..32b415eb831f0 100644 --- a/src/os/FileJournal.cc +++ b/src/os/FileJournal.cc @@ -169,10 +169,13 @@ static int get_kernel_version(int *a, int *b, int *c) } if (sscanf(buf, "Linux version %d.%d.%d", a, b, c) != 3) { - derr << "get_kernel_version: failed to parse string: '" - << buf << "'" << dendl; - ret = EIO; - goto close_fd; + if (sscanf(buf, "Linux version %d.%d", a, b) != 2) { + derr << "get_kernel_version: failed to parse string: '" + << buf << "'" << dendl; + ret = EIO; + goto close_fd; + } + *c = 0; } dout(0) << " kernel version is " << *a <<"." << *b << "." << *c << dendl; -- 2.39.5