From: Sage Weil <sage@newdream.net>
Date: Thu, 18 Feb 2010 05:11:30 +0000 (-0800)
Subject: filestore: only do btrfs_snap if btrfs
X-Git-Tag: v0.20~430
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4540b5e61a8321c20e5d69917e5d16927943528e;p=ceph.git

filestore: only do btrfs_snap if btrfs
---

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 1e6397a4dc9d..5d6d1a4ef128 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -538,7 +538,7 @@ int FileStore::mount()
 
     dout(0) << "mount found snaps " << snaps << dendl;
   }
-  if (g_conf.filestore_btrfs_snap) {
+  if (btrfs && g_conf.filestore_btrfs_snap) {
     if (snaps.empty()) {
       dout(0) << "mount WARNING: no consistent snaps found, store may be in inconsistent state" << dendl;
     } else if (!btrfs) {
@@ -1466,7 +1466,7 @@ void FileStore::sync_entry()
       sprintf(s, "%lld\n", (long long unsigned)cp);
       ::pwrite(op_fd, s, strlen(s), 0);
 
-      bool do_snap = g_conf.filestore_btrfs_snap;
+      bool do_snap = btrfs && g_conf.filestore_btrfs_snap;
 
       if (do_snap) {
 	btrfs_ioctl_vol_args snapargs;