From 133ed04ecd583dc9b0e9840e22e71f850052699b Mon Sep 17 00:00:00 2001
From: sageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Mon, 5 Feb 2007 00:33:41 +0000
Subject: [PATCH] statvfs in client, as per newer fuse api

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1076 29311d96-e01e-0410-9327-a35deaab8ce9
---
 trunk/ceph/client/Client.cc | 10 ----------
 trunk/ceph/client/Client.h  |  4 ----
 trunk/ceph/client/fuse.cc   | 11 -----------
 3 files changed, 25 deletions(-)

diff --git a/trunk/ceph/client/Client.cc b/trunk/ceph/client/Client.cc
index f0a3e81427c4f..e71f3ed7d0550 100644
--- a/trunk/ceph/client/Client.cc
+++ b/trunk/ceph/client/Client.cc
@@ -21,9 +21,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#ifdef DARWIN
 #include <sys/statvfs.h>
-#endif // DARWIN
 
 
 #include <iostream>
@@ -2529,7 +2527,6 @@ int Client::chdir(const char *path)
   return 0;
 }
 
-#ifdef DARWIN
 int Client::statfs(const char *path, struct statvfs *stbuf)
 {
   bzero (stbuf, sizeof (struct statvfs));
@@ -2546,13 +2543,6 @@ int Client::statfs(const char *path, struct statvfs *stbuf)
 
   return 0;
 }
-#else
-int Client::statfs(const char *path, struct statfs *stbuf) 
-{
-  assert(0);  // implement me
-  return 0;
-}
-#endif
 
 
 int Client::lazyio_propogate(int fd, off_t offset, size_t count)
diff --git a/trunk/ceph/client/Client.h b/trunk/ceph/client/Client.h
index f1d90232acc18..d7dd07a17adfd 100644
--- a/trunk/ceph/client/Client.h
+++ b/trunk/ceph/client/Client.h
@@ -523,11 +523,7 @@ protected:
   int unmount();
 
   // these shoud (more or less) mirror the actual system calls.
-#ifdef DARWIN
   int statfs(const char *path, struct statvfs *stbuf);
-#else
-  int statfs(const char *path, struct statfs *stbuf);
-#endif
 
   // crap
   int chdir(const char *s);
diff --git a/trunk/ceph/client/fuse.cc b/trunk/ceph/client/fuse.cc
index 94d15f9f79179..64497820f381e 100644
--- a/trunk/ceph/client/fuse.cc
+++ b/trunk/ceph/client/fuse.cc
@@ -36,11 +36,7 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <errno.h>
-#ifdef DARWIN
 #include <sys/statvfs.h>
-#else
-#include <sys/statfs.h>
-#endif // DARWIN
 
 
 // ceph stuff
@@ -190,17 +186,10 @@ static int ceph_flush(const char *path, struct fuse_file_info *fi)
 */
 
 
-#ifdef DARWIN
 static int ceph_statfs(const char *path, struct statvfs *stbuf)
 {
   return client->statfs(path, stbuf);
 }
-#else
-static int ceph_statfs(const char *path, struct statfs *stbuf)
-{
-  return client->statfs(path, stbuf);
-}
-#endif
 
 
 
-- 
2.39.5