From: Sage Weil <sage@newdream.net>
Date: Thu, 14 Jan 2010 23:46:26 +0000 (-0800)
Subject: filestore: don't croak if current/ exists
X-Git-Tag: v0.19~171
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=adf613f2cc9b0df6c5fc3a5a9cb0f87358370ac5;p=ceph.git

filestore: don't croak if current/ exists
---

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index cbb6e2f7b345..c609c641405d 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -295,6 +295,8 @@ int FileStore::mkfs()
   } else if (errno == EOPNOTSUPP || errno == ENOTTY) {
     dout(2) << " BTRFS_IOC_SUBVOL_CREATE ioctl failed, trying mkdir " << current_fn << dendl;
     r = ::mkdir(current_fn, 0755);
+    if (errno == EEXIST)
+      r = 0;
   }
   ::close(fd);
   if (r < 0) {