filejournal: parse kernel version 3.0+

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc
index d6e3a0a2a3302807d7fa473276ef04d7e630d6a2..32b415eb831f0640b944dfcedb4e293b638a406d 100644 (file)
--- 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;