From: Wido den Hollander <wido@widodh.nl>
Date: Sat, 27 Aug 2011 20:37:05 +0000 (+0200)
Subject: FileJournal: Also classify kernel major version 3 as safe with disk-cache on
X-Git-Tag: v0.35~203
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=66f1d41dae9ef7cb17d0ba56d402fa61e678d90a;p=ceph.git

FileJournal: Also classify kernel major version 3 as safe with disk-cache on

Signed-off-by: Wido den Hollander <wido@widodh.nl>
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
---

diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc
index ee661d6865b2..6f28450fa1da 100644
--- a/src/os/FileJournal.cc
+++ b/src/os/FileJournal.cc
@@ -238,7 +238,7 @@ void FileJournal::_check_disk_write_cache() const
       dout(10) << "_check_disk_write_cache: failed to get kernel version."
 	       << dendl;
     }
-    else if (a >= 2 && b >= 6 && c >= 33) {
+    else if ((a >= 2 && b >= 6 && c >= 33) || a >= 3) {
       dout(20) << "_check_disk_write_cache: disk write cache is on, but your "
 	       << "kernel is new enough to handle it correctly. (fn:"
 	       << fn << ")" << dendl;