diff options
author | Amar Tumballi <amar@gluster.com> | 2011-07-13 00:37:25 +0000 |
---|---|---|
committer | Anand Avati <avati@gluster.com> | 2011-07-12 23:34:18 -0700 |
commit | 7c4ad6d3321cc440590a6132b7dc8d0d0a58ce3b (patch) | |
tree | 6ee6b53e9ae46d5bbbe2d4e7a648ce570765ef34 /xlators/storage/posix/src/posix-helpers.c | |
parent | 8b57a5c2fb16f2c85c0f74edbe7b841a6dc4a265 (diff) |
storage/posix: set all keys present in 'params' dict while creating an entry
so, there is no need to do a 'setxattr()' after entry creation, which could now
fail due to ACL on server side.
Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>
BUG: 3164 (set xattr keys while entry creation)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=3164
Diffstat (limited to 'xlators/storage/posix/src/posix-helpers.c')
-rw-r--r-- | xlators/storage/posix/src/posix-helpers.c | 38 |
1 files changed, 35 insertions, 3 deletions
diff --git a/xlators/storage/posix/src/posix-helpers.c b/xlators/storage/posix/src/posix-helpers.c index 7b130d4b918..5aa09d97769 100644 --- a/xlators/storage/posix/src/posix-helpers.c +++ b/xlators/storage/posix/src/posix-helpers.c @@ -394,7 +394,7 @@ out: int -posix_set_file_contents (xlator_t *this, char *real_path, +posix_set_file_contents (xlator_t *this, const char *real_path, data_pair_t *trav, int flags) { char * key = NULL; @@ -476,7 +476,7 @@ out: int -posix_get_file_contents (xlator_t *this, char *real_path, +posix_get_file_contents (xlator_t *this, const char *real_path, const char *name, char **contents) { char real_filepath[ZR_PATH_MAX] = {0,}; @@ -546,7 +546,7 @@ out: static int gf_xattr_enotsup_log; int -posix_handle_pair (xlator_t *this, char *real_path, +posix_handle_pair (xlator_t *this, const char *real_path, data_pair_t *trav, int flags) { int sys_ret = -1; @@ -885,3 +885,35 @@ out: return ret; } +int +posix_entry_create_xattr_set (xlator_t *this, const char *path, + dict_t *dict) +{ + data_pair_t *trav = NULL; + int ret = -1; + + trav = dict->members_list; + while (trav) { + if (!strcmp (GFID_XATTR_KEY, trav->key) || + !strcmp ("gfid-req", trav->key) || + !strcmp ("system.posix_acl_default", trav->key) || + !strcmp ("system.posix_acl_access", trav->key) || + ZR_FILE_CONTENT_REQUEST(trav->key)) { + trav = trav->next; + continue; + } + + ret = posix_handle_pair (this, path, trav, XATTR_CREATE); + if (ret < 0) { + errno = -ret; + ret = -1; + goto out; + } + trav = trav->next; + } + + ret = 0; + +out: + return ret; +} |