From 20ef211cfa5b5fcc437484a879fdc5d4c66bbaf5 Mon Sep 17 00:00:00 2001 From: ShyamsundarR Date: Thu, 29 Nov 2018 14:08:06 -0500 Subject: libglusterfs: Move devel headers under glusterfs directory libglusterfs devel package headers are referenced in code using include semantics for a program, this while it works can be better especially when dealing with out of tree xlator builds or in general out of tree devel package usage. Towards this, the following changes are done, - moved all devel headers under a glusterfs directory - Included these headers using system header notation <> in all code outside of libglusterfs - Included these headers using own program notation "" within libglusterfs This change although big, is just moving around the headers and making it correct when including these headers from other sources. This helps us correctly include libglusterfs includes without namespace conflicts. Change-Id: Id2a98854e671a7ee5d73be44da5ba1a74252423b Updates: bz#1193929 Signed-off-by: ShyamsundarR --- libglusterfs/src/gf-dirent.h | 71 -------------------------------------------- 1 file changed, 71 deletions(-) delete mode 100644 libglusterfs/src/gf-dirent.h (limited to 'libglusterfs/src/gf-dirent.h') diff --git a/libglusterfs/src/gf-dirent.h b/libglusterfs/src/gf-dirent.h deleted file mode 100644 index 95403e9eabd..00000000000 --- a/libglusterfs/src/gf-dirent.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - Copyright (c) 2008-2012 Red Hat, Inc. - This file is part of GlusterFS. - - This file is licensed to you under your choice of the GNU Lesser - General Public License, version 3 or any later version (LGPLv3 or - later), or the GNU General Public License, version 2 (GPLv2), in all - cases as published by the Free Software Foundation. -*/ - -#ifndef _GF_DIRENT_H -#define _GF_DIRENT_H - -#include "iatt.h" -#include "inode.h" - -#define gf_dirent_size(name) (sizeof(gf_dirent_t) + strlen(name) + 1) - -int -gf_deitransform(xlator_t *this, uint64_t y); - -int -gf_itransform(xlator_t *this, uint64_t x, uint64_t *y_p, int client_id); - -uint64_t -gf_dirent_orig_offset(xlator_t *this, uint64_t offset); - -struct _dir_entry { - struct _dir_entry *next; - char *name; - char *link; - struct iatt buf; -}; - -struct _gf_dirent { - union { - struct list_head list; - struct { - struct _gf_dirent *next; - struct _gf_dirent *prev; - }; - }; - uint64_t d_ino; - uint64_t d_off; - uint32_t d_len; - uint32_t d_type; - struct iatt d_stat; - dict_t *dict; - inode_t *inode; - char d_name[]; -}; - -#define DT_ISDIR(mode) (mode == DT_DIR) - -gf_dirent_t * -gf_dirent_for_name(const char *name); -gf_dirent_t * -entry_copy(gf_dirent_t *source); -void -gf_dirent_entry_free(gf_dirent_t *entry); -void -gf_dirent_free(gf_dirent_t *entries); -int -gf_link_inodes_from_dirent(xlator_t *this, inode_t *parent, - gf_dirent_t *entries); -int -gf_fill_iatt_for_dirent(gf_dirent_t *entry, inode_t *parent, xlator_t *subvol); - -void -gf_link_inode_from_dirent(xlator_t *this, inode_t *parent, gf_dirent_t *entry); -#endif /* _GF_DIRENT_H */ -- cgit