From 3c016355e44afbb10ee02b9ba09e107355b27f7a Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 2 Dec 2005 14:53:56 +0000 Subject: r12019: - let us only reference libblkid stuff in one file - and make it it bit simpler, by caching the GUID struct instead of the device name - and this also removes all compiler warnings... metze (This used to be commit f4f0d626e00116e85a91962bf8534c1fbb69334c) --- source4/ntvfs/posix/vfs_posix.h | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'source4/ntvfs/posix/vfs_posix.h') diff --git a/source4/ntvfs/posix/vfs_posix.h b/source4/ntvfs/posix/vfs_posix.h index f18864197d..9eec368157 100644 --- a/source4/ntvfs/posix/vfs_posix.h +++ b/source4/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 - -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; @@ -83,10 +74,6 @@ struct pvfs_state { 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 */ -- cgit