lib: Move statvfs.[ch] to lib/util

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Anoop C S <anoopcs@samba.org>

diff --git a/source3/smbd/statvfs.c b/lib/util/statvfs.c
similarity index 100%
rename from source3/smbd/statvfs.c
rename to lib/util/statvfs.c

diff --git a/source3/smbd/statvfs.h b/lib/util/statvfs.h
similarity index 100%
rename from source3/smbd/statvfs.h
rename to lib/util/statvfs.h

diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 0f25fbd21602e10d807bc77823a744ec815ef6b5..cd62876f87bc1095cbec020565e7520bfe591dc0 100644 (file)
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -189,6 +189,7 @@ else:
                          dprintf.c
                          dns_cmp.c
                          fsusage.c
+                         statvfs.c
                          genrand_util.c
                          getpass.c
                          idtree_random.c

diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
index 51d3940910b4ee72fe49c9ff25e982425632903d..b35af684599743842b56c1076aeacad8934e9d56 100644 (file)
--- a/source3/modules/vfs_ceph.c
+++ b/source3/modules/vfs_ceph.c
@@ -32,7 +32,7 @@
 
 #include "includes.h"
 #include "smbd/smbd.h"
-#include "smbd/statvfs.h"
+#include "lib/util/statvfs.h"
 #include "system/filesys.h"
 #include <dirent.h>
 #include <sys/statvfs.h>

diff --git a/source3/modules/vfs_ceph_new.c b/source3/modules/vfs_ceph_new.c
index e0ead9a63838a846857f3d76fd6eff38aecc0edd..935ed2c605d5b03f92ba35d6342821b8c61fea5c 100644 (file)
--- a/source3/modules/vfs_ceph_new.c
+++ b/source3/modules/vfs_ceph_new.c
@@ -32,7 +32,7 @@
 
 #include "includes.h"
 #include "smbd/smbd.h"
-#include "smbd/statvfs.h"
+#include "lib/util/statvfs.h"
 #include "system/filesys.h"
 #include <dirent.h>
 #include <sys/statvfs.h>

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 54e085a8b2a6a9c75e05b1fa829b9597c9cc7cf8..629750b2cfd999571ec47fb1fdc7952f553446c8 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -37,7 +37,7 @@
 #include "offload_token.h"
 #include "util_reparse.h"
 #include "lib/util/string_wrappers.h"
-#include "source3/smbd/statvfs.h"
+#include "lib/util/statvfs.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS

diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index 5f5ca9282041e0b693cffa942aebd0cb1d4e7357..8ee36bc8e64b1e559ba26c4d43f96a34b42119da 100644 (file)
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -37,7 +37,7 @@
 
 #include "includes.h"
 #include "smbd/smbd.h"
-#include "smbd/statvfs.h"
+#include "lib/util/statvfs.h"
 #include <stdio.h>
 #include <glusterfs/api/glfs.h>
 #include "lib/util/dlinklist.h"

diff --git a/source3/smbd/smb2_trans2.c b/source3/smbd/smb2_trans2.c
index a684ebbde6aefd370f3a48ff34e1b61cd0ca6695..b29fcbcca79ef03703bd41283b7d3bc49cd69673 100644 (file)
--- a/source3/smbd/smb2_trans2.c
+++ b/source3/smbd/smb2_trans2.c
@@ -30,7 +30,7 @@
 #include "version.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
-#include "smbd/statvfs.h"
+#include "lib/util/statvfs.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/xattr.h"
 #include "../librpc/gen_ndr/ndr_security.h"

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 9f0aa9b435811a15dd382e65412bf7739ace8425..5f0a8d6fe4905b0229d13697389e0ff5a6529ccd 100644 (file)
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -27,7 +27,7 @@
 #include "system/filesys.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
-#include "smbd/statvfs.h"
+#include "lib/util/statvfs.h"
 #include "../lib/util/memcache.h"
 #include "transfer_file.h"
 #include "ntioctl.h"

diff --git a/source3/wscript_build b/source3/wscript_build
index e4a595dd180e5d4241caded0031e1b8d545c1f14..585a181c8bc9723484a88d9f2206d152ad261a78 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -684,7 +684,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
                           smbd/quotas.c
                           smbd/ntquotas.c
                           smbd/msdfs.c
-                          smbd/smb2_aio.c smbd/statvfs.c
+                          smbd/smb2_aio.c
                           smbd/dmapi.c
                           smbd/smb2_signing.c
                           smbd/file_access.c