summaryrefslogtreecommitdiffstats
path: root/xlators/storage/posix/src
diff options
context:
space:
mode:
authorNithya Balachandran <nbalacha@redhat.com>2015-08-27 13:10:18 +0530
committerRaghavendra G <rgowdapp@redhat.com>2015-08-31 21:11:52 -0700
commit8abb8f625b038dc676709f500255f051b008ea49 (patch)
tree8b61d0522115c441552ddc73d1cff313c21463c5 /xlators/storage/posix/src
parent9e1e4ae03ab51c43817c044578603bc343063aa2 (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')
-rw-r--r--xlators/storage/posix/src/posix-helpers.c15
-rw-r--r--xlators/storage/posix/src/posix.c11
-rw-r--r--xlators/storage/posix/src/posix.h4
3 files changed, 23 insertions, 7 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);
diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c
index b8bb47ac91d..cafe565c321 100644
--- a/xlators/storage/posix/src/posix.c
+++ b/xlators/storage/posix/src/posix.c
@@ -3231,7 +3231,7 @@ _handle_setxattr_keyvalue_pair (dict_t *d, char *k, data_t *v,
filler = tmp;
return posix_handle_pair (filler->this, filler->real_path, k, v,
- filler->flags);
+ filler->flags, filler->stbuf);
}
#ifdef GF_DARWIN_HOST_OS
@@ -3305,6 +3305,8 @@ posix_setxattr (call_frame_t *frame, xlator_t *this,
goto out;
}
+ posix_pstat(this, loc->gfid, real_path, &stbuf);
+
op_ret = -1;
dict_del (dict, GFID_XATTR_KEY);
@@ -3312,6 +3314,8 @@ posix_setxattr (call_frame_t *frame, xlator_t *this,
filler.real_path = real_path;
filler.this = this;
+ filler.stbuf = &stbuf;
+
#ifdef GF_DARWIN_HOST_OS
filler.flags = map_xattr_flags(flags);
#else
@@ -4476,7 +4480,7 @@ _handle_fsetxattr_keyvalue_pair (dict_t *d, char *k, data_t *v,
filler = tmp;
return posix_fhandle_pair (filler->this, filler->fdnum, k, v,
- filler->flags);
+ filler->flags, filler->stbuf);
}
int32_t
@@ -4509,11 +4513,14 @@ posix_fsetxattr (call_frame_t *frame, xlator_t *this,
}
_fd = pfd->fd;
+ posix_fdstat (this, pfd->fd, &stbuf);
+
dict_del (dict, GFID_XATTR_KEY);
dict_del (dict, GF_XATTR_VOL_ID_KEY);
filler.fdnum = _fd;
filler.this = this;
+ filler.stbuf = &stbuf;
#ifdef GF_DARWIN_HOST_OS
filler.flags = map_xattr_flags(flags);
#else
diff --git a/xlators/storage/posix/src/posix.h b/xlators/storage/posix/src/posix.h
index cf1465a7fcc..f8230be324b 100644
--- a/xlators/storage/posix/src/posix.h
+++ b/xlators/storage/posix/src/posix.h
@@ -207,9 +207,9 @@ int posix_pstat (xlator_t *this, uuid_t gfid, const char *real_path,
dict_t *posix_xattr_fill (xlator_t *this, const char *path, loc_t *loc,
fd_t *fd, int fdnum, dict_t *xattr, struct iatt *buf);
int posix_handle_pair (xlator_t *this, const char *real_path, char *key,
- data_t *value, int flags);
+ data_t *value, int flags, struct iatt *stbuf);
int posix_fhandle_pair (xlator_t *this, int fd, char *key, data_t *value,
- int flags);
+ int flags, struct iatt *stbuf);
void posix_spawn_janitor_thread (xlator_t *this);
int posix_get_file_contents (xlator_t *this, uuid_t pargfid,
const char *name, char **contents);