Merge branch 'upstream'

Conflicts:
	glusterfs.spec.in
	xlators/mgmt/glusterd/src/Makefile.am
	xlators/mgmt/glusterd/src/glusterd-utils.c
	xlators/mgmt/glusterd/src/glusterd.h

Change-Id: I27bdcf42b003cfc42d6ad981bd2bf8180176806d

1 files changed, 11 insertions, 0 deletions

diff --git a/api/src/glfs-handles.h b/api/src/glfs-handles.h
index 548268fd6..277b20a3d 100644
--- a/api/src/glfs-handles.h
+++ b/api/src/glfs-handles.h
@@ -135,9 +135,17 @@ int glfs_h_stat(struct glfs *fs, struct glfs_object *object,
 int glfs_h_getattrs (struct glfs *fs, struct glfs_object *object,
 		     struct stat *stat) __THROW;
 
+int glfs_h_getxattrs (struct glfs *fs, struct glfs_object *object,
+		      const char *name, void *value,
+		      size_t size) __THROW;
+
 int glfs_h_setattrs (struct glfs *fs, struct glfs_object *object,
 		     struct stat *sb, int valid) __THROW;
 
+int glfs_h_setxattrs (struct glfs *fs, struct glfs_object *object,
+		      const char *name, const void *value,
+		      size_t size, int flags) __THROW;
+
 int glfs_h_readlink (struct glfs *fs, struct glfs_object *object, char *buf,
 		     size_t bufsiz) __THROW;
 
@@ -154,6 +162,9 @@ int glfs_h_rename_with_xdata (struct glfs *fs, struct glfs_object *olddir,
                               const char *oldname, struct glfs_object *newdir,
                               const char *newname, dict_t *dict) __THROW;
 
+int glfs_h_removexattrs (struct glfs *fs, struct glfs_object *object,
+			 const char *name) __THROW;
+
 /* Operations enabling opaque invariant handle to object transitions */
 ssize_t glfs_h_extract_handle (struct glfs_object *object,
 			       unsigned char *handle, int len) __THROW;