From b246b07896fefb261c9fb07f3f29f0d03b81b88d Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Mon, 14 Mar 2016 10:59:38 +0530 Subject: dht/afr/client/posix: Fail mkdir without gfid-req Do not allow directory creations without gfids as after the directories are created, operations on them fail anyway. So it is better to fail mkdir. BUG: 1317361 Change-Id: I8f8e3b38bbded1960b7215bac0432500f7e78038 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.org/13690 Smoke: Gluster Build System Reviewed-by: Krutika Dhananjay CentOS-regression: Gluster Build System NetBSD-regression: NetBSD Build System --- xlators/protocol/client/src/client-messages.h | 10 +++++++++- xlators/protocol/client/src/client-rpc-fops.c | 9 +++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'xlators/protocol/client/src') diff --git a/xlators/protocol/client/src/client-messages.h b/xlators/protocol/client/src/client-messages.h index a4b391b8331..db27661715b 100644 --- a/xlators/protocol/client/src/client-messages.h +++ b/xlators/protocol/client/src/client-messages.h @@ -45,7 +45,7 @@ */ #define GLFS_PC_BASE GLFS_MSGID_COMP_PC -#define GLFS_PC_NUM_MESSAGES 63 +#define GLFS_PC_NUM_MESSAGES 65 #define GLFS_PC_MSGID_END (GLFS_PC_BASE + GLFS_NUM_MESSAGES + 1) /* Messages with message IDs */ #define glfs_msg_start_x GLFS_PC_BASE, "Invalid: Start of messages" @@ -619,6 +619,14 @@ */ #define PC_MSG_CHILD_STATUS (GLFS_PC_BASE + 64) +/*! + * @messageid + * @diagnosis + * @recommendedaction + * + */ +#define PC_MSG_GFID_NULL (GLFS_PC_BASE + 65) + /*------------*/ #define glfs_msg_end_x GLFS_MSGID_END, "Invalid: End of messages" diff --git a/xlators/protocol/client/src/client-rpc-fops.c b/xlators/protocol/client/src/client-rpc-fops.c index e1fee8c7c66..c95a973ec72 100644 --- a/xlators/protocol/client/src/client-rpc-fops.c +++ b/xlators/protocol/client/src/client-rpc-fops.c @@ -4110,6 +4110,15 @@ client3_3_mkdir (call_frame_t *frame, xlator_t *this, args = data; + if (!args->xdata || !dict_get (args->xdata, "gfid-req")) { + op_errno = EPERM; + gf_msg_callingfn (this->name, GF_LOG_WARNING, op_errno, + PC_MSG_GFID_NULL, "mkdir: %s is received " + "without gfid-req %p", args->loc->path, + args->xdata); + goto unwind; + } + local = mem_get0 (this->local_pool); if (!local) { op_errno = ENOMEM; -- cgit