From f9b7cd53b9fe253b122cb545c2dd1be073ab0592 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 1 Jun 2012 13:41:46 +1000 Subject: s4-xattr: Use libreplace xattr functions directly --- source4/ntvfs/posix/xattr_system.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'source4/ntvfs/posix/xattr_system.c') diff --git a/source4/ntvfs/posix/xattr_system.c b/source4/ntvfs/posix/xattr_system.c index f22c0e9ea4..ebb2010e38 100644 --- a/source4/ntvfs/posix/xattr_system.c +++ b/source4/ntvfs/posix/xattr_system.c @@ -21,7 +21,6 @@ #include "includes.h" #include "vfs_posix.h" -#include "../lib/util/wrap_xattr.h" /* pull a xattr as a blob, from either a file or a file descriptor @@ -43,9 +42,9 @@ NTSTATUS pull_xattr_blob_system(struct pvfs_state *pvfs, again: if (fd != -1) { - ret = wrap_fgetxattr(fd, attr_name, blob->data, estimated_size); + ret = fgetxattr(fd, attr_name, blob->data, estimated_size); } else { - ret = wrap_getxattr(fname, attr_name, blob->data, estimated_size); + ret = getxattr(fname, attr_name, blob->data, estimated_size); } if (ret == -1 && errno == ERANGE) { estimated_size *= 2; @@ -104,9 +103,9 @@ NTSTATUS push_xattr_blob_system(struct pvfs_state *pvfs, int ret; if (fd != -1) { - ret = wrap_fsetxattr(fd, attr_name, blob->data, blob->length, 0); + ret = fsetxattr(fd, attr_name, blob->data, blob->length, 0); } else { - ret = wrap_setxattr(fname, attr_name, blob->data, blob->length, 0); + ret = setxattr(fname, attr_name, blob->data, blob->length, 0); } if (ret == -1) { return pvfs_map_errno(pvfs, errno); @@ -125,9 +124,9 @@ NTSTATUS delete_xattr_system(struct pvfs_state *pvfs, const char *attr_name, int ret; if (fd != -1) { - ret = wrap_fremovexattr(fd, attr_name); + ret = fremovexattr(fd, attr_name); } else { - ret = wrap_removexattr(fname, attr_name); + ret = removexattr(fname, attr_name); } if (ret == -1) { return pvfs_map_errno(pvfs, errno); -- cgit