diff options
author | Nithya Balachandran <nbalacha@redhat.com> | 2015-08-27 13:10:18 +0530 |
---|---|---|
committer | Raghavendra G <rgowdapp@redhat.com> | 2015-08-31 21:11:52 -0700 |
commit | 8abb8f625b038dc676709f500255f051b008ea49 (patch) | |
tree | 8b61d0522115c441552ddc73d1cff313c21463c5 /xlators/storage/posix/src/posix-helpers.c | |
parent | 9e1e4ae03ab51c43817c044578603bc343063aa2 (diff) |
cluster/dht: Don't set posix acls on linkto files
Posix acls on a linkto file change the file's permission
bits and cause DHT to treat it as a non-linkto file.This
happens on the migration failure of a file on which posix
acls were set.
The fix prevents posix acls from being set on a linkto
file and copies them across only after a file has
been successfully migrated.
Change-Id: Iccf7ff6fba49fe05d691d9b83bf76a240848b212
BUG: 1258377
Signed-off-by: Nithya Balachandran <nbalacha@redhat.com>
Reviewed-on: http://review.gluster.org/12025
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Signed-off-by: N Balachandran <nbalacha@redhat.com>
Reviewed-on: http://review.gluster.org/12062
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators/storage/posix/src/posix-helpers.c')
-rw-r--r-- | xlators/storage/posix/src/posix-helpers.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/xlators/storage/posix/src/posix-helpers.c b/xlators/storage/posix/src/posix-helpers.c index cae56e7b590..082e74eb6f5 100644 --- a/xlators/storage/posix/src/posix-helpers.c +++ b/xlators/storage/posix/src/posix-helpers.c @@ -1072,7 +1072,7 @@ void posix_dump_buffer (xlator_t *this, const char *real_path, const char *key, int posix_handle_pair (xlator_t *this, const char *real_path, - char *key, data_t *value, int flags) + char *key, data_t *value, int flags, struct iatt *stbuf) { int sys_ret = -1; int ret = 0; @@ -1084,7 +1084,12 @@ posix_handle_pair (xlator_t *this, const char *real_path, ret = posix_set_file_contents (this, real_path, key, value, flags); } else if (GF_POSIX_ACL_REQUEST (key)) { + if (stbuf && IS_DHT_LINKFILE_MODE (stbuf)) + goto out; ret = posix_pacl_set (real_path, key, value->data); + } else if (!strncmp(key, POSIX_ACL_ACCESS_XATTR, strlen(key)) + && stbuf && IS_DHT_LINKFILE_MODE (stbuf)) { + goto out; } else { sys_ret = sys_lsetxattr (real_path, key, value->data, value->len, flags); @@ -1135,7 +1140,7 @@ out: int posix_fhandle_pair (xlator_t *this, int fd, - char *key, data_t *value, int flags) + char *key, data_t *value, int flags, struct iatt *stbuf) { int sys_ret = -1; int ret = 0; @@ -1143,6 +1148,9 @@ posix_fhandle_pair (xlator_t *this, int fd, if (XATTR_IS_PATHINFO (key)) { ret = -EACCES; goto out; + } else if (!strncmp(key, POSIX_ACL_ACCESS_XATTR, strlen(key)) + && stbuf && IS_DHT_LINKFILE_MODE (stbuf)) { + goto out; } sys_ret = sys_fsetxattr (fd, key, value->data, @@ -1525,7 +1533,7 @@ _handle_entry_create_keyvalue_pair (dict_t *d, char *k, data_t *v, } ret = posix_handle_pair (filler->this, filler->real_path, k, v, - XATTR_CREATE); + XATTR_CREATE, filler->stbuf); if (ret < 0) { errno = -ret; return -1; @@ -1546,6 +1554,7 @@ posix_entry_create_xattr_set (xlator_t *this, const char *path, filler.this = this; filler.real_path = path; + filler.stbuf = NULL; ret = dict_foreach (dict, _handle_entry_create_keyvalue_pair, &filler); |