From 62dd323759fe2e9f45980835d97567ad8a4c371a Mon Sep 17 00:00:00 2001 From: Kotresh HR Date: Wed, 30 Dec 2015 15:25:30 +0530 Subject: features/bitrot: Fail node-uuid getxattr if file is marked bad If xattr is node-uuid and the inode is marked bad, fail getxattr and fgetxattr with EIO. Returning EIO would result in AFR to choose correct node-uuid coresponding to the subvolume where the good copy of the file resides. BUG: 1296795 Change-Id: I3f8dc807794f9a82867807e7c4c73ded6c64fd8a Signed-off-by: Kotresh HR Reviewed-on: http://review.gluster.org/13116 Tested-by: NetBSD Build System Tested-by: Gluster Build System Reviewed-by: Venky Shankar Reviewed-on: http://review.gluster.org/13194 Tested-by: Venky Shankar Smoke: Gluster Build System Reviewed-by: Raghavendra Bhat CentOS-regression: Gluster Build System NetBSD-regression: NetBSD Build System --- xlators/features/bit-rot/src/stub/bit-rot-stub.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'xlators/features/bit-rot') diff --git a/xlators/features/bit-rot/src/stub/bit-rot-stub.c b/xlators/features/bit-rot/src/stub/bit-rot-stub.c index 5b2d5d70698..1ec9d459845 100644 --- a/xlators/features/bit-rot/src/stub/bit-rot-stub.c +++ b/xlators/features/bit-rot/src/stub/bit-rot-stub.c @@ -1608,6 +1608,17 @@ br_stub_getxattr (call_frame_t *frame, xlator_t *this, goto wind; } + /** + * If xattr is node-uuid and the inode is marked bad, return EIO. + * Returning EIO would result in AFR to choose correct node-uuid + * coresponding to the subvolume * where the good copy of the + * file resides. + */ + if (IA_ISREG (loc->inode->ia_type) && XATTR_IS_NODE_UUID (name) && + br_stub_check_bad_object (this, loc->inode, &op_ret, &op_errno)) { + goto unwind; + } + if (br_stub_is_internal_xattr (name)) goto unwind; @@ -1671,6 +1682,17 @@ br_stub_fgetxattr (call_frame_t *frame, xlator_t *this, goto wind; } + /** + * If xattr is node-uuid and the inode is marked bad, return EIO. + * Returning EIO would result in AFR to choose correct node-uuid + * coresponding to the subvolume * where the good copy of the + * file resides. + */ + if (IA_ISREG (fd->inode->ia_type) && XATTR_IS_NODE_UUID (name) && + br_stub_check_bad_object (this, fd->inode, &op_ret, &op_errno)) { + goto unwind; + } + if (br_stub_is_internal_xattr (name)) goto unwind; -- cgit