r12019: - let us only reference libblkid stuff in one file

[kai/samba-autobuild/.git] / source / ntvfs / posix / vfs_posix.h

diff --git a/source/ntvfs/posix/vfs_posix.h b/source/ntvfs/posix/vfs_posix.h
index a55674d69a2d9fd0f96b483fea57d1e9e077eca4..9eec368157d7cf4f493cf88f780fe790c8b8918e 100644 (file)
--- a/source/ntvfs/posix/vfs_posix.h
+++ b/source/ntvfs/posix/vfs_posix.h
@@ -26,21 +26,12 @@
 #include "system/filesys.h"
 #include "smb_server/smb_server.h"
 
-/* We use libblkid out of e2fsprogs to identify UUID of a volume */
-#ifdef HAVE_LIBBLKID
-#include <blkid/blkid.h>
-
-typedef struct {
-       blkid_cache cache;
-       const char *devname;
-} blkid_cache_wrap_t;
-#endif
-
 /* this is the private structure for the posix vfs backend. It is used
    to hold per-connection (per tree connect) state information */
 struct pvfs_state {
        struct smbsrv_tcon *tcon;
        const char *base_directory;
+       struct GUID *base_fs_uuid;
 
        const char *share_name;
        uint_t flags;
@@ -72,15 +63,17 @@ struct pvfs_state {
        /* if posix:eadb is set, then this gets setup */
        struct tdb_wrap *ea_db;
 
+       /* the allocation size rounding */
+       uint32_t alloc_size_rounding;
+
+       /* how long to keep inactive searches around for */
+       uint_t search_inactivity_time;
+       
        /* used to accelerate acl mapping */
        struct {
                const struct dom_sid *creator_owner;
                const struct dom_sid *creator_group;            
        } sid_cache;
-
-#ifdef HAVE_LIBBLKID
-       blkid_cache_wrap_t *blkid_cache;
-#endif
 };
 
 /* this is the basic information needed about a file from the filesystem */