andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

posix: return more xattrs at getxattr/fgetxattr when client request

Browse Source 
Change-Id: I37ac6186b3631979d2503d1b185a61b8094dbd0d
Updates: bz#1634220
Signed-off-by: Kinglong Mee <mijinlong@open-fs.com>
This commit is contained in:
Kinglong Mee 2018-09-29 12:10:46 +08:00 committed by Amar Tumballi
parent 573253d250
commit 24dbcfb6eb
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
xlators/storage/posix/src/posix-inode-fd-ops.c
View File

@ -2970,6 +2970,10 @@ posix_getxattr(call_frame_t *frame, xlator_t *this, loc_t *loc,
int keybuff_len;
char *value_buf = NULL;
gf_boolean_t have_val = _gf_false;
struct iatt buf = {
0,
};
dict_t *xattr_rsp = NULL;
DECLARE_OLD_FS_ID_VAR;
@ -3438,6 +3442,11 @@ posix_getxattr(call_frame_t *frame, xlator_t *this, loc_t *loc,
done:
op_ret = size;
if (xdata && (op_ret >= 0)) {
xattr_rsp = posix_xattr_fill(this, real_path, loc, NULL, -1, xdata,
&buf);
}
if (dict) {
dict_del(dict, GFID_XATTR_KEY);
dict_del(dict, GF_XATTR_VOL_ID_KEY);
@ -3446,7 +3455,10 @@ done:
out:
SET_TO_OLD_FS_ID();
STACK_UNWIND_STRICT(getxattr, frame, op_ret, op_errno, dict, NULL);
STACK_UNWIND_STRICT(getxattr, frame, op_ret, op_errno, dict, xattr_rsp);
if (xattr_rsp)
dict_unref(xattr_rsp);
if (dict) {
dict_unref(dict);
@ -3476,6 +3488,10 @@ posix_fgetxattr(call_frame_t *frame, xlator_t *this, fd_t *fd, const char *name,
int key_len;
char *value_buf = NULL;
gf_boolean_t have_val = _gf_false;
struct iatt buf = {
0,
};
dict_t *xattr_rsp = NULL;
DECLARE_OLD_FS_ID_VAR;
@ -3730,6 +3746,11 @@ posix_fgetxattr(call_frame_t *frame, xlator_t *this, fd_t *fd, const char *name,
done:
op_ret = size;
if (xdata && (op_ret >= 0)) {
xattr_rsp = posix_xattr_fill(this, NULL, NULL, fd, pfd->fd, xdata,
&buf);
}
if (dict) {
dict_del(dict, GFID_XATTR_KEY);
dict_del(dict, GF_XATTR_VOL_ID_KEY);
@ -3738,7 +3759,10 @@ done:
out:
SET_TO_OLD_FS_ID();
STACK_UNWIND_STRICT(fgetxattr, frame, op_ret, op_errno, dict, NULL);
STACK_UNWIND_STRICT(fgetxattr, frame, op_ret, op_errno, dict, xattr_rsp);
if (xattr_rsp)
dict_unref(xattr_rsp);
if (dict)
dict_unref(dict);