diff options
| -rw-r--r-- | xlators/protocol/server/src/server-common.c | 3 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server-helpers.c | 2 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server-rpc-fops.c | 2 | 
3 files changed, 4 insertions, 3 deletions
diff --git a/xlators/protocol/server/src/server-common.c b/xlators/protocol/server/src/server-common.c index fd6749a4df7..9a023aaa49e 100644 --- a/xlators/protocol/server/src/server-common.c +++ b/xlators/protocol/server/src/server-common.c @@ -21,9 +21,6 @@ server_post_readlink (gfs3_readlink_rsp *rsp, struct iatt *stbuf,  {          gf_stat_from_iatt (&rsp->buf, stbuf);          rsp->path = (char *)buf; - -        if (!rsp->path) -                rsp->path = "";  }  void diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c index 39fbcbc6763..474db926629 100644 --- a/xlators/protocol/server/src/server-helpers.c +++ b/xlators/protocol/server/src/server-helpers.c @@ -2321,6 +2321,8 @@ server_populate_compound_response (xlator_t *this, gfs3_compound_rsp *rsp,                  rsp_args->op_ret = this_args_cbk->op_ret;                  rsp_args->op_errno  = gf_errno_to_error                                        (this_args_cbk->op_errno); +                if (!rsp_args->path) +                        rsp_args->path = "";                  break;          }          case GF_FOP_MKNOD: diff --git a/xlators/protocol/server/src/server-rpc-fops.c b/xlators/protocol/server/src/server-rpc-fops.c index 91644ce0103..fa160a52d79 100644 --- a/xlators/protocol/server/src/server-rpc-fops.c +++ b/xlators/protocol/server/src/server-rpc-fops.c @@ -1569,6 +1569,8 @@ server_readlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,  out:          rsp.op_ret    = op_ret;          rsp.op_errno  = gf_errno_to_error (op_errno); +        if (!rsp.path) +                rsp.path = "";          req = frame->local;          server_submit_reply (frame, req, &rsp, NULL, 0, NULL,  | 
