diff options
| -rw-r--r-- | xlators/nfs/server/src/nfs-messages.h | 60 | ||||
| -rw-r--r-- | xlators/nfs/server/src/nfs3-helpers.c | 104 | ||||
| -rw-r--r-- | xlators/nfs/server/src/nfs3-helpers.h | 23 | ||||
| -rw-r--r-- | xlators/nfs/server/src/nfs3.c | 496 |
4 files changed, 336 insertions, 347 deletions
diff --git a/xlators/nfs/server/src/nfs-messages.h b/xlators/nfs/server/src/nfs-messages.h index fe4a798b256..b3d134d11be 100644 --- a/xlators/nfs/server/src/nfs-messages.h +++ b/xlators/nfs/server/src/nfs-messages.h @@ -48,7 +48,7 @@ /*------------*/ -#define NFS_MSG_SVC_LOOKUP (GLFS_NFS_BASE + 1) +#define NFS_MSG_UNUSED_1 (GLFS_NFS_BASE + 1) /*! * @messageid * @diagnosis @@ -56,7 +56,7 @@ * */ -#define NFS_MSG_SVC_PAR_LOOKUP (GLFS_NFS_BASE + 2) +#define NFS_MSG_UNUSED_2 (GLFS_NFS_BASE + 2) /*! * @messageid * @diagnosis @@ -104,7 +104,7 @@ * */ -#define NFS_MSG_ACCESS_CBK (GLFS_NFS_BASE + 8) +#define NFS_MSG_UNUSED_8 (GLFS_NFS_BASE + 8) /*! * @messageid * @diagnosis @@ -112,7 +112,7 @@ * */ -#define NFS_MSG_READLINK_CBK (GLFS_NFS_BASE + 9) +#define NFS_MSG_UNUSED_9 (GLFS_NFS_BASE + 9) /*! * @messageid * @diagnosis @@ -128,7 +128,7 @@ * */ -#define NFS_MSG_READ_CBK (GLFS_NFS_BASE + 11) +#define NFS_MSG_UNUSED_11 (GLFS_NFS_BASE + 11) /*! * @messageid * @diagnosis @@ -151,7 +151,7 @@ * */ -#define NFS_MSG_FSYNC_CBK (GLFS_NFS_BASE + 14) +#define NFS_MSG_UNUSED_14 (GLFS_NFS_BASE + 14) /*! * @messageid * @diagnosis @@ -159,7 +159,7 @@ * */ -#define NFS_MSG_WRITE_CBK (GLFS_NFS_BASE + 15) +#define NFS_MSG_UNUSED_15 (GLFS_NFS_BASE + 15) /*! * @messageid * @diagnosis @@ -183,7 +183,7 @@ * */ -#define NFS_MSG_CREATE_SETATTR_CBK (GLFS_NFS_BASE + 18) +#define NFS_MSG_UNUSED_18 (GLFS_NFS_BASE + 18) /*! * @messageid * @diagnosis @@ -191,7 +191,7 @@ * */ -#define NFS_MSG_CREATE_CBK (GLFS_NFS_BASE + 19) +#define NFS_MSG_UNUSED_19 (GLFS_NFS_BASE + 19) /*! * @messageid * @diagnosis @@ -199,7 +199,7 @@ * */ -#define NFS_MSG_CREATE_STAT_CBK (GLFS_NFS_BASE + 20) +#define NFS_MSG_UNUSED_20 (GLFS_NFS_BASE + 20) /*! * @messageid * @diagnosis @@ -215,7 +215,8 @@ * @recommendedaction * */ -#define NFS_MSG_MKDIR_SETATTR_CBK (GLFS_NFS_BASE + 22) + +#define NFS_MSG_UNUSED_22 (GLFS_NFS_BASE + 22) /*! * @messageid * @diagnosis @@ -223,8 +224,7 @@ * */ - -#define NFS_MSG_MKDIR_CBK (GLFS_NFS_BASE + 23) +#define NFS_MSG_UNUSED_23 (GLFS_NFS_BASE + 23) /*! * @messageid * @diagnosis @@ -240,7 +240,7 @@ * */ -#define NFS_MSG_SYMLINK_CBK (GLFS_NFS_BASE + 25) +#define NFS_MSG_UNUSED_25 (GLFS_NFS_BASE + 25) /*! * @messageid * @diagnosis @@ -256,7 +256,7 @@ * */ -#define NFS_MSG_MKNOD_CBK (GLFS_NFS_BASE + 27) +#define NFS_MSG_UNUSED_27 (GLFS_NFS_BASE + 27) /*! * @messageid * @diagnosis @@ -281,7 +281,7 @@ */ -#define NFS_MSG_REMOVE_CBK (GLFS_NFS_BASE + 30) +#define NFS_MSG_UNUSED_30 (GLFS_NFS_BASE + 30) /*! * @messageid * @diagnosis @@ -305,7 +305,7 @@ * */ -#define NFS_MSG_RENAME_CBK (GLFS_NFS_BASE + 33) +#define NFS_MSG_UNUSED_33 (GLFS_NFS_BASE + 33) /*! * @messageid * @diagnosis @@ -321,7 +321,7 @@ * */ -#define NFS_MSG_LINK_CBK (GLFS_NFS_BASE + 35) +#define NFS_MSG_UNUSED_35 (GLFS_NFS_BASE + 35) /*! * @messageid * @diagnosis @@ -337,7 +337,7 @@ * */ -#define NFS_MSG_READDIR_FSTAT_CBK (GLFS_NFS_BASE + 37) +#define NFS_MSG_UNUSED_37 (GLFS_NFS_BASE + 37) /*! * @messageid * @diagnosis @@ -345,7 +345,7 @@ * */ -#define NFS_MSG_READDIR_CBK (GLFS_NFS_BASE + 38) +#define NFS_MSG_UNUSED_38 (GLFS_NFS_BASE + 38) /*! * @messageid * @diagnosis @@ -369,7 +369,7 @@ * */ -#define NFS_MSG_FSSTAT_STAT_CBK (GLFS_NFS_BASE + 41) +#define NFS_MSG_UNUSED_41 (GLFS_NFS_BASE + 41) /*! * @messageid * @diagnosis @@ -377,7 +377,7 @@ * */ -#define NFS_MSG_FSSTAT_STATFS_CBK (GLFS_NFS_BASE + 42) +#define NFS_MSG_UNUSED_42 (GLFS_NFS_BASE + 42) /*! * @messageid * @diagnosis @@ -392,7 +392,7 @@ * */ -#define NFS_MSG_FSINFO_CBK (GLFS_NFS_BASE + 44) +#define NFS_MSG_UNUSED_44 (GLFS_NFS_BASE + 44) /*! * @messageid * @diagnosis @@ -408,7 +408,7 @@ * */ -#define NFS_MSG_PATHCONF_CBK (GLFS_NFS_BASE + 46) +#define NFS_MSG_UNUSED_46 (GLFS_NFS_BASE + 46) /*! * @messageid * @diagnosis @@ -424,7 +424,7 @@ * */ -#define NFS_MSG_COMMIT_CBK (GLFS_NFS_BASE + 48) +#define NFS_MSG_UNUSED_48 (GLFS_NFS_BASE + 48) /*! * @messageid * @diagnosis @@ -632,7 +632,7 @@ * */ -#define NFS_MSG_GETATTR_LOOKUP_CBK (GLFS_NFS_BASE + 75) +#define NFS_MSG_UNUSED_75 (GLFS_NFS_BASE + 75) /*! * @messageid * @diagnosis @@ -640,7 +640,7 @@ * */ -#define NFS_MSG_GETATTR_STAT_CBK (GLFS_NFS_BASE + 76) +#define NFS_MSG_UNUSED_76 (GLFS_NFS_BASE + 76) /*! * @messageid * @diagnosis @@ -664,7 +664,7 @@ * */ -#define NFS_MSG_TRUNCATE_CBK (GLFS_NFS_BASE + 79) +#define NFS_MSG_UNUSED_79 (GLFS_NFS_BASE + 79) /*! * @messageid * @diagnosis @@ -672,7 +672,7 @@ * */ -#define NFS_MSG_SETATTR_STAT_CBK (GLFS_NFS_BASE + 80) +#define NFS_MSG_UNUSED_80 (GLFS_NFS_BASE + 80) /*! * @messageid * @diagnosis @@ -704,7 +704,7 @@ * */ -#define NFS_MSG_SETATTR_CBK (GLFS_NFS_BASE + 84) +#define NFS_MSG_UNUSED_84 (GLFS_NFS_BASE + 84) /*! * @messageid * @diagnosis diff --git a/xlators/nfs/server/src/nfs3-helpers.c b/xlators/nfs/server/src/nfs3-helpers.c index 2670e60c759..2c24f94f540 100644 --- a/xlators/nfs/server/src/nfs3-helpers.c +++ b/xlators/nfs/server/src/nfs3-helpers.c @@ -3382,7 +3382,8 @@ nfs3_loglevel (int nfs_op, nfsstat3 stat) { } void -nfs3_log_common_res (uint32_t xid, int op, nfsstat3 stat, int pstat) +nfs3_log_common_res (uint32_t xid, int op, nfsstat3 stat, int pstat, + const char *path) { char errstr[1024]; int ll = nfs3_loglevel (op, stat); @@ -3391,14 +3392,17 @@ nfs3_log_common_res (uint32_t xid, int op, nfsstat3 stat, int pstat) return; nfs3_stat_to_errstr (xid, nfs3op_strings[op].str, stat, pstat, errstr, sizeof (errstr)); if (ll == GF_LOG_DEBUG) - gf_msg_debug (GF_NFS3, 0, "%s", errstr); + gf_msg_debug (GF_NFS3, 0, "%s => (%s)", path, + errstr); else - gf_msg (GF_NFS3, ll, errno, NFS_MSG_STAT_ERROR, "%s", errstr); + gf_msg (GF_NFS3, ll, errno, NFS_MSG_STAT_ERROR, + "%s => (%s)", path, errstr); } void -nfs3_log_readlink_res (uint32_t xid, nfsstat3 stat, int pstat, char *linkpath) +nfs3_log_readlink_res (uint32_t xid, nfsstat3 stat, int pstat, char *linkpath, + const char *path) { char errstr[1024]; int ll = nfs3_loglevel (NFS3_READLINK, stat); @@ -3408,15 +3412,18 @@ nfs3_log_readlink_res (uint32_t xid, nfsstat3 stat, int pstat, char *linkpath) nfs3_stat_to_errstr (xid, "READLINK", stat, pstat, errstr, sizeof (errstr)); if (ll == GF_LOG_DEBUG) - gf_msg_debug (GF_NFS3, 0, "%s, target: %s", errstr, linkpath); + gf_msg_debug (GF_NFS3, 0, "%s => (%s), target: %s", path, + errstr, linkpath); else - gf_msg (GF_NFS3, ll, errno, NFS_MSG_STAT_ERROR, "%s, target: %s", - errstr, linkpath); + gf_msg (GF_NFS3, ll, errno, NFS_MSG_STAT_ERROR, + "%s => (%s) target: %s" , path, + errstr, linkpath); } void nfs3_log_read_res (uint32_t xid, nfsstat3 stat, int pstat, count3 count, - int is_eof, struct iovec *vec, int32_t veccount) + int is_eof, struct iovec *vec, + int32_t veccount, const char *path) { char errstr[1024]; int ll = GF_LOG_DEBUG; @@ -3427,30 +3434,31 @@ nfs3_log_read_res (uint32_t xid, nfsstat3 stat, int pstat, count3 count, nfs3_stat_to_errstr (xid, "READ", stat, pstat, errstr, sizeof (errstr)); if (vec) if (ll == GF_LOG_DEBUG) - gf_msg (GF_NFS3, ll, errno, NFS_MSG_STAT_ERROR, - "%s, count: %"PRIu32", is_eof:" - " %d, vector: count: %d, len: %zd", errstr, - count, is_eof, veccount, vec->iov_len); - else gf_msg_debug (GF_NFS3, 0, - "%s, count: %"PRIu32", is_eof:" - " %d, vector: count: %d, len: %zd", errstr, - count, is_eof, veccount, vec->iov_len); + "%s => (%s), count: %"PRIu32", is_eof:" + " %d, vector: count: %d, len: %zd", path, + errstr, count, is_eof, veccount, + vec->iov_len); + else + gf_msg (GF_NFS3, ll, errno, NFS_MSG_STAT_ERROR, + "%s => (%s), count: %"PRIu32", is_eof:" + " %d, vector: count: %d, len: %zd", path, + errstr, count, is_eof, veccount, vec->iov_len); else if (ll == GF_LOG_DEBUG) gf_msg_debug (GF_NFS3, 0, - "%s, count: %"PRIu32", is_eof:" - " %d", errstr, count, is_eof); + "%s => (%s), count: %"PRIu32", is_eof:" + " %d", path, errstr, count, is_eof); else gf_msg (GF_NFS3, ll, errno, NFS_MSG_STAT_ERROR, - "%s, count: %"PRIu32", is_eof:" - " %d", errstr, count, is_eof); + "%s => (%s), count: %"PRIu32", is_eof:" + " %d", path, errstr, count, is_eof); } void nfs3_log_write_res (uint32_t xid, nfsstat3 stat, int pstat, count3 count, - int stable, uint64_t wverf) + int stable, uint64_t wverf, const char *path) { char errstr[1024]; int ll = nfs3_loglevel (NFS3_WRITE, stat); @@ -3461,19 +3469,19 @@ nfs3_log_write_res (uint32_t xid, nfsstat3 stat, int pstat, count3 count, nfs3_stat_to_errstr (xid, "WRITE", stat, pstat, errstr, sizeof (errstr)); if (ll == GF_LOG_DEBUG) gf_msg_debug (GF_NFS3, 0, - "%s, count: %"PRIu32", %s,wverf: %"PRIu64 - , errstr, count, (stable == UNSTABLE)?"UNSTABLE":"STABLE", - wverf); + "%s => (%s), count: %"PRIu32", %s,wverf: " + "%"PRIu64, path, errstr, count, + (stable == UNSTABLE)?"UNSTABLE":"STABLE", wverf); else gf_msg (GF_NFS3, ll, errno, NFS_MSG_STAT_ERROR, - "%s, count: %"PRIu32", %s,wverf: %"PRIu64 - , errstr, count, (stable == UNSTABLE)?"UNSTABLE":"STABLE", - wverf); + "%s => (%s), count: %"PRIu32", %s,wverf: %"PRIu64 + , path, errstr, count, + (stable == UNSTABLE)?"UNSTABLE":"STABLE", wverf); } void nfs3_log_newfh_res (uint32_t xid, int op, nfsstat3 stat, int pstat, - struct nfs3_fh *newfh) + struct nfs3_fh *newfh, const char *path) { char errstr[1024]; char fhstr[1024]; @@ -3485,15 +3493,16 @@ nfs3_log_newfh_res (uint32_t xid, int op, nfsstat3 stat, int pstat, nfs3_fh_to_str (newfh, fhstr, sizeof (fhstr)); if (ll == GF_LOG_DEBUG) - gf_msg_debug (GF_NFS3, 0, "%s, %s", errstr, fhstr); + gf_msg_debug (GF_NFS3, 0, "%s => (%s), %s", path, errstr, + fhstr); else gf_msg (GF_NFS3, nfs3_loglevel (op, stat), errno, NFS_MSG_STAT_ERROR, - "%s, %s", errstr, fhstr); + "%s => (%s), %s", path, errstr, fhstr); } void nfs3_log_readdir_res (uint32_t xid, nfsstat3 stat, int pstat, uint64_t cverf, - count3 count, int is_eof) + count3 count, int is_eof, const char *path) { char errstr[1024]; int ll = nfs3_loglevel (NFS3_READDIR, stat); @@ -3503,17 +3512,19 @@ nfs3_log_readdir_res (uint32_t xid, nfsstat3 stat, int pstat, uint64_t cverf, nfs3_stat_to_errstr (xid, "READDIR", stat, pstat, errstr, sizeof (errstr)); if (ll == GF_LOG_DEBUG) gf_msg_debug (GF_NFS3, 0, - "%s, count: %"PRIu32", cverf: %"PRIu64 - ", is_eof: %d", errstr, count, cverf, is_eof); + "%s => (%s), count: %"PRIu32", cverf: %"PRIu64 + ", is_eof: %d", path, errstr, count, cverf, + is_eof); else gf_msg (GF_NFS3, ll, errno, NFS_MSG_STAT_ERROR, - "%s, count: %"PRIu32", cverf: %"PRIu64 - ", is_eof: %d", errstr, count, cverf, is_eof); + "%s => (%s), count: %"PRIu32", cverf: %"PRIu64 + ", is_eof: %d", path, errstr, count, cverf, is_eof); } void nfs3_log_readdirp_res (uint32_t xid, nfsstat3 stat, int pstat, uint64_t cverf, - count3 dircount, count3 maxcount, int is_eof) + count3 dircount, count3 maxcount, int is_eof, + const char *path) { char errstr[1024]; int ll = nfs3_loglevel (NFS3_READDIRP, stat); @@ -3523,19 +3534,20 @@ nfs3_log_readdirp_res (uint32_t xid, nfsstat3 stat, int pstat, uint64_t cverf, nfs3_stat_to_errstr (xid, "READDIRPLUS", stat, pstat, errstr, sizeof (errstr)); if (ll == GF_LOG_DEBUG) gf_msg_debug (GF_NFS3, 0, - "%s, dircount: %"PRIu32", maxcount: %" - PRIu32", cverf: %"PRIu64", is_eof: %d", errstr, dircount, - maxcount, cverf, is_eof); + "%s => (%s), dircount: %"PRIu32", maxcount: %" + PRIu32", cverf: %"PRIu64", is_eof: %d", path, + errstr, dircount, maxcount, cverf, is_eof); else gf_msg (GF_NFS3, ll, errno, NFS_MSG_STAT_ERROR, - "%s, dircount: %"PRIu32", maxcount: %" - PRIu32", cverf: %"PRIu64", is_eof: %d", errstr, dircount, - maxcount, cverf, is_eof); + "%s => (%s), dircount: %"PRIu32", maxcount: %" + PRIu32", cverf: %"PRIu64", is_eof: %d", path, errstr, + dircount, maxcount, cverf, is_eof); } void -nfs3_log_commit_res (uint32_t xid, nfsstat3 stat, int pstat, uint64_t wverf) +nfs3_log_commit_res (uint32_t xid, nfsstat3 stat, int pstat, uint64_t wverf, + const char *path) { char errstr[1024]; int ll = nfs3_loglevel (NFS3_COMMIT, stat); @@ -3544,11 +3556,11 @@ nfs3_log_commit_res (uint32_t xid, nfsstat3 stat, int pstat, uint64_t wverf) return; nfs3_stat_to_errstr (xid, "COMMIT", stat, pstat, errstr, sizeof (errstr)); if (ll == GF_LOG_DEBUG) - gf_msg_debug (GF_NFS3, 0, "%s, wverf: %"PRIu64, - errstr, wverf); + gf_msg_debug (GF_NFS3, 0, "%s => (%s), wverf: %"PRIu64, + path, errstr, wverf); else gf_msg (GF_NFS3, ll, errno, NFS_MSG_STAT_ERROR, - "%s, wverf: %"PRIu64, errstr, wverf); + "%s => (%s), wverf: %"PRIu64, path, errstr, wverf); } diff --git a/xlators/nfs/server/src/nfs3-helpers.h b/xlators/nfs/server/src/nfs3-helpers.h index 2e358d4b016..213639e3806 100644 --- a/xlators/nfs/server/src/nfs3-helpers.h +++ b/xlators/nfs/server/src/nfs3-helpers.h @@ -245,33 +245,38 @@ extern int nfs3_cached_inode_opened (xlator_t *nfsxl, inode_t *inode); extern void -nfs3_log_common_res (uint32_t xid, int op, nfsstat3 stat, int pstat); +nfs3_log_common_res (uint32_t xid, int op, nfsstat3 stat, int pstat, + const char *path); extern void -nfs3_log_readlink_res (uint32_t xid, nfsstat3 stat, int pstat, char *linkpath); +nfs3_log_readlink_res (uint32_t xid, nfsstat3 stat, int pstat, + char *linkpath, const char *path); extern void -nfs3_log_read_res (uint32_t xid, nfsstat3 stat, int pstat, count3 count, - int is_eof, struct iovec *vec, int32_t vcount); +nfs3_log_read_res (uint32_t xid, nfsstat3 stat, int pstat, + count3 count, int is_eof, struct iovec *vec, + int32_t vcount, const char *path); extern void nfs3_log_write_res (uint32_t xid, nfsstat3 stat, int pstat, count3 count, - int stable, uint64_t wverf); + int stable, uint64_t wverf, const char *path); extern void nfs3_log_newfh_res (uint32_t xid, int op, nfsstat3 stat, int pstat, - struct nfs3_fh *newfh); + struct nfs3_fh *newfh, const char *path); extern void nfs3_log_readdir_res (uint32_t xid, nfsstat3 stat, int pstat, uint64_t cverf, - count3 count, int is_eof); + count3 count, int is_eof, const char *path); extern void nfs3_log_readdirp_res (uint32_t xid, nfsstat3 stat, int pstat, uint64_t cverf, - count3 dircount, count3 maxcount, int is_eof); + count3 dircount, count3 maxcount, int is_eof, + const char *path); extern void -nfs3_log_commit_res (uint32_t xid, nfsstat3 stat, int pstat, uint64_t wverf); +nfs3_log_commit_res (uint32_t xid, nfsstat3 stat, int pstat, uint64_t wverf, + const char *path); extern void nfs3_log_common_call (uint32_t xid, char *op, struct nfs3_fh *fh); diff --git a/xlators/nfs/server/src/nfs3.c b/xlators/nfs/server/src/nfs3.c index b4f95cae993..6b31c6462e0 100644 --- a/xlators/nfs/server/src/nfs3.c +++ b/xlators/nfs/server/src/nfs3.c @@ -750,18 +750,15 @@ nfs3svc_getattr_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, */ if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, - NFS_MSG_GETATTR_LOOKUP_CBK, "%x: %s => -1 (%s)", - rpcsvc_request_xid (cs->req), cs->resolvedloc.path, - strerror (op_errno)); status = nfs3_cbk_errno_status (op_ret, op_errno); } else { nfs_fix_generation(this,inode); } - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_GETATTR, - status, op_errno); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_GETATTR, status, op_errno, + cs->resolvedloc.path); nfs3_getattr_reply (cs->req, status, buf); nfs3_call_state_wipe (cs); @@ -781,15 +778,12 @@ nfs3svc_getattr_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, - NFS_MSG_GETATTR_STAT_CBK, "%x: %s => -1 (%s)", - rpcsvc_request_xid (cs->req), cs->resolvedloc.path, - strerror (op_errno)); status = nfs3_cbk_errno_status (op_ret, op_errno); } - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_GETATTR, - status, op_errno); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_GETATTR, status, op_errno, + cs->resolvedloc.path); nfs3_getattr_reply (cs->req, status, buf); nfs3_call_state_wipe (cs); @@ -867,7 +861,8 @@ check_err: nfs3err: if (ret < 0) { nfs3_log_common_res (rpcsvc_request_xid (cs->req), - NFS3_GETATTR, stat, -ret); + NFS3_GETATTR, stat, -ret, + cs->resolvedloc.path); nfs3_getattr_reply (cs->req, stat, &cs->stbuf); nfs3_call_state_wipe (cs); ret = 0; @@ -902,8 +897,9 @@ nfs3_getattr (rpcsvc_request_t *req, struct nfs3_fh *fh) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (req), NFS3_GETATTR, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (req), + NFS3_GETATTR, stat, -ret, + NULL); nfs3_getattr_reply (req, stat, NULL); ret = 0; nfs3_call_state_wipe (cstate); @@ -970,9 +966,6 @@ nfs3svc_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, NFS_MSG_TRUNCATE_CBK, - "%x: %s => -1 (%s)", rpcsvc_request_xid (cs->req), - cs->resolvedloc.path, strerror (op_errno)); stat = nfs3_cbk_errno_status (op_ret, op_errno); goto nfs3err; } @@ -988,8 +981,9 @@ nfs3svc_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this, stat = NFS3_OK; nfs3err: - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_SETATTR, stat, - op_errno); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_SETATTR, stat, op_errno, + cs->resolvedloc.path); nfs3_setattr_reply (cs->req, stat, prestat, postbuf); nfs3_call_state_wipe (cs); @@ -1010,9 +1004,6 @@ nfs3svc_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, NFS_MSG_SETATTR_CBK, - "%x: %s => -1 (%s)", rpcsvc_request_xid (cs->req), - cs->resolvedloc.path, strerror (op_errno)); stat = nfs3_cbk_errno_status (op_ret, op_errno); goto nfs3err; } @@ -1043,7 +1034,8 @@ nfs3svc_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, nfs3err: if (ret < 0) { nfs3_log_common_res (rpcsvc_request_xid (cs->req), - NFS3_SETATTR, stat, op_errno); + NFS3_SETATTR, stat, op_errno, + cs->resolvedloc.path); nfs3_setattr_reply (cs->req, stat, prebuf, postop); nfs3_call_state_wipe (cs); } @@ -1066,10 +1058,6 @@ nfs3svc_setattr_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, - NFS_MSG_SETATTR_STAT_CBK, "%x: %s => -1 (%s)", - rpcsvc_request_xid (cs->req), cs->resolvedloc.path, - strerror (op_errno)); stat = nfs3_cbk_errno_status (op_ret, op_errno); goto nfs3err; } @@ -1092,7 +1080,8 @@ nfs3svc_setattr_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, nfs3err: if (ret < 0) { nfs3_log_common_res (rpcsvc_request_xid (cs->req), - NFS3_SETATTR, stat, op_errno); + NFS3_SETATTR, stat, op_errno, + cs->resolvedloc.path); nfs3_setattr_reply (cs->req, stat, NULL, NULL); nfs3_call_state_wipe (cs); } @@ -1125,7 +1114,8 @@ nfs3_setattr_resume (void *carg) nfs3err: if (ret < 0) { nfs3_log_common_res (rpcsvc_request_xid (cs->req), - NFS3_SETATTR, stat, -ret); + NFS3_SETATTR, stat, -ret, + cs->resolvedloc.path); nfs3_setattr_reply (cs->req, stat, NULL, NULL); nfs3_call_state_wipe (cs); } @@ -1182,8 +1172,9 @@ nfs3_setattr (rpcsvc_request_t *req, struct nfs3_fh *fh, sattr3 *sattr, nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (req), NFS3_SETATTR, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (req), + NFS3_SETATTR, stat, -ret, + cs->resolvedloc.path); nfs3_setattr_reply (req, stat, NULL, NULL); nfs3_call_state_wipe (cs); /* Ret must be 0 after this so that the caller does not @@ -1285,16 +1276,6 @@ nfs3svc_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - if (op_errno == ENOENT) { - gf_msg_trace (GF_NFS, 0, "%x: %s => -1 (%s)", - rpcsvc_request_xid (cs->req), - cs->resolvedloc.path, strerror (op_errno)); - } else { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, - NFS_MSG_SVC_LOOKUP, "%x: %s => -1 (%s)", - rpcsvc_request_xid (cs->req), - cs->resolvedloc.path, strerror (op_errno)); - } status = nfs3_cbk_errno_status (op_ret, op_errno); goto xmit_res; } @@ -1310,7 +1291,8 @@ xmit_res: } nfs3_log_newfh_res (rpcsvc_request_xid (cs->req), NFS3_LOOKUP, - status, op_errno, &newfh); + status, op_errno, &newfh, + cs->resolvedloc.path); nfs3_lookup_reply (cs->req, status, &newfh, buf, postparent); nfs3_call_state_wipe (cs); out: @@ -1337,10 +1319,6 @@ nfs3svc_lookup_parentdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, - NFS_MSG_SVC_PAR_LOOKUP, "%x: %s => -1 (%s)", - rpcsvc_request_xid (cs->req), cs->resolvedloc.path, - strerror (op_errno)); status = nfs3_cbk_errno_status (op_ret, op_errno); goto xmit_res; } @@ -1364,8 +1342,9 @@ nfs3svc_lookup_parentdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, } xmit_res: - nfs3_log_newfh_res (rpcsvc_request_xid (cs->req), NFS3_LOOKUP, status, - op_errno, &newfh); + nfs3_log_newfh_res (rpcsvc_request_xid (cs->req), NFS3_LOOKUP, + status, op_errno, &newfh, + cs->resolvedloc.path); nfs3_lookup_reply (cs->req, status, &newfh, buf, postparent); nfs3_call_state_wipe (cs); @@ -1439,8 +1418,9 @@ errtostat: nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_LOOKUP, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_LOOKUP, stat, -ret, + cs->resolvedloc.path); nfs3_lookup_reply (cs->req, stat, NULL, NULL, NULL); nfs3_call_state_wipe (cs); } @@ -1486,8 +1466,9 @@ nfs3_lookup_resume (void *carg) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_LOOKUP, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_LOOKUP, stat, -ret, + cs->resolvedloc.path); nfs3_lookup_reply (cs->req, stat, &newfh, &cs->stbuf, &cs->postparent); nfs3_call_state_wipe (cs); @@ -1535,9 +1516,9 @@ nfs3_lookup (rpcsvc_request_t *req, struct nfs3_fh *fh, int fhlen, char *name) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (req), NFS3_LOOKUP, - stat, - -ret); + nfs3_log_common_res (rpcsvc_request_xid (req), + NFS3_LOOKUP, stat, -ret, + cs->resolvedloc.path); nfs3_lookup_reply (req, stat, NULL, NULL, NULL); nfs3_call_state_wipe (cs); /* Ret must be 0 after this so that the caller does not @@ -1605,14 +1586,12 @@ nfs3svc_access_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, NFS_MSG_ACCESS_CBK, - "%x: %s => -1 (%s)", rpcsvc_request_xid (cs->req), - cs->resolvedloc.path, strerror (op_errno)); status = nfs3_cbk_errno_status (op_ret, op_errno); } - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_ACCESS, - status, op_errno); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_ACCESS, status, op_errno, + cs->resolvedloc.path); nfs3_access_reply (cs->req, status, op_errno, cs->accessbits); nfs3_call_state_wipe (cs); @@ -1656,8 +1635,9 @@ nfs3_access_resume (void *carg) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_ACCESS, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_ACCESS, stat, -ret, + cs->resolvedloc.path); nfs3_access_reply (cs->req, stat, 0, 0); nfs3_call_state_wipe (cs); ret = 0; @@ -1692,8 +1672,9 @@ nfs3_access (rpcsvc_request_t *req, struct nfs3_fh *fh, uint32_t accbits) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (req), NFS3_ACCESS, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (req), + NFS3_ACCESS, stat, -ret, + cs->resolvedloc.path); nfs3_access_reply (req, stat, 0, 0); nfs3_call_state_wipe (cs); ret = 0; @@ -1761,9 +1742,6 @@ nfs3svc_readlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, NFS_MSG_READLINK_CBK, - "%x: %s => -1 (%s)", rpcsvc_request_xid (cs->req), - cs->resolvedloc.path, strerror (op_errno)); stat = nfs3_cbk_errno_status (op_ret, op_errno); goto nfs3err; } @@ -1771,8 +1749,9 @@ nfs3svc_readlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this, stat = NFS3_OK; nfs3err: - nfs3_log_readlink_res (rpcsvc_request_xid (cs->req), stat, op_errno, - (char *)path); + nfs3_log_readlink_res (rpcsvc_request_xid (cs->req), + stat, op_errno, (char *)path, + cs->resolvedloc.path); nfs3_readlink_reply (cs->req, stat, (char *)path, buf); nfs3_call_state_wipe (cs); @@ -1803,7 +1782,8 @@ nfs3_readlink_resume (void *carg) nfs3err: if (ret < 0) { nfs3_log_common_res (rpcsvc_request_xid (cs->req), - NFS3_READLINK, stat, -ret); + NFS3_READLINK, stat, -ret, + cs->resolvedloc.path); nfs3_readlink_reply (cs->req, stat, NULL, NULL); nfs3_call_state_wipe (cs); } @@ -1840,8 +1820,9 @@ nfs3_readlink (rpcsvc_request_t *req, struct nfs3_fh *fh) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (req), NFS3_READLINK, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (req), + NFS3_READLINK, stat, -ret, + cs->resolvedloc.path); nfs3_readlink_reply (req, stat, NULL, NULL); nfs3_call_state_wipe (cs); /* Ret must be 0 after this so that the caller does not @@ -1933,9 +1914,6 @@ nfs3svc_read_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, NFS_MSG_READ_CBK, - "%x: %s => -1 (%s)", rpcsvc_request_xid (cs->req), - cs->resolvedloc.path, strerror (op_errno)); stat = nfs3_cbk_errno_status (op_ret, op_errno); goto err; } else @@ -1945,8 +1923,10 @@ nfs3svc_read_cbk (call_frame_t *frame, void *cookie, xlator_t *this, is_eof = 1; err: - nfs3_log_read_res (rpcsvc_request_xid (cs->req), stat, op_errno, - op_ret, is_eof, vector, count); + nfs3_log_read_res (rpcsvc_request_xid (cs->req), + stat, op_errno, + op_ret, is_eof, vector, count, + cs->resolvedloc.path); nfs3_read_reply (cs->req, stat, op_ret, vector, count, iobref, stbuf, is_eof); nfs3_call_state_wipe (cs); @@ -1975,8 +1955,9 @@ nfs3_read_fd_resume (void *carg) stat = nfs3_errno_to_nfsstat3 (-ret); nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_READ, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_READ, stat, -ret, + cs->resolvedloc.path); nfs3_read_reply (cs->req, stat, 0, NULL, 0, NULL, NULL, 0); nfs3_call_state_wipe (cs); } @@ -2011,8 +1992,9 @@ nfs3_read_resume (void *carg) ret = 0; nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_READ, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_READ, stat, -ret, + cs->resolvedloc.path); nfs3_read_reply (cs->req, stat, 0, NULL,0, NULL, NULL, 0); nfs3_call_state_wipe (cs); } @@ -2052,8 +2034,9 @@ nfs3_read (rpcsvc_request_t *req, struct nfs3_fh *fh, offset3 offset, nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (req), NFS3_READ, stat, - -ret); + nfs3_log_common_res (rpcsvc_request_xid (req), + NFS3_READ, stat, -ret, + cs->resolvedloc.path); nfs3_read_reply (req, stat, 0, NULL,0, NULL, NULL, 0); nfs3_call_state_wipe (cs); ret = 0; @@ -2125,15 +2108,14 @@ nfs3svc_write_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this, nfs3 = rpcsvc_request_program_private (cs->req); if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, NFS_MSG_FSYNC_CBK, - "%x: %s => -1 (%s)", rpcsvc_request_xid (cs->req), - cs->resolvedloc.path, strerror (op_errno)); stat = nfs3_cbk_errno_status (op_ret, op_errno); } else stat = NFS3_OK; - nfs3_log_write_res (rpcsvc_request_xid (cs->req), stat, op_errno, - cs->maxcount, cs->writetype, nfs3->serverstart); + nfs3_log_write_res (rpcsvc_request_xid (cs->req), + stat, op_errno, + cs->maxcount, cs->writetype, nfs3->serverstart, + cs->resolvedloc.path); nfs3_write_reply (cs->req, stat, cs->maxcount, cs->writetype, nfs3->serverstart, &cs->stbuf, postbuf); nfs3_call_state_wipe (cs); @@ -2185,9 +2167,6 @@ nfs3svc_write_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; nfs3 = rpcsvc_request_program_private (cs->req); if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, NFS_MSG_WRITE_CBK, - "%x: %s => -1 (%s)", rpcsvc_request_xid (cs->req), - cs->resolvedloc.path, strerror (op_errno)); stat = nfs3_cbk_errno_status (op_ret, op_errno); goto err; } @@ -2196,9 +2175,9 @@ nfs3svc_write_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs->maxcount = op_ret; err: - nfs3_log_write_res (rpcsvc_request_xid (cs->req), stat, - op_errno, cs->maxcount, cs->writetype, - nfs3->serverstart); + nfs3_log_write_res (rpcsvc_request_xid (cs->req), + stat, op_errno, cs->maxcount, cs->writetype, + nfs3->serverstart, cs->resolvedloc.path); nfs3_write_reply (cs->req, stat, cs->maxcount, cs->writetype, nfs3->serverstart, prebuf, postbuf); @@ -2284,8 +2263,9 @@ nfs3_write_resume (void *carg) stat = nfs3_errno_to_nfsstat3 (-ret); nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_WRITE, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_WRITE, stat, -ret, + cs->resolvedloc.path); nfs3_write_reply (cs->req, stat, 0, cs->writetype, 0, NULL, NULL); nfs3_call_state_wipe (cs); @@ -2331,8 +2311,9 @@ nfs3_write (rpcsvc_request_t *req, struct nfs3_fh *fh, offset3 offset, nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (req), NFS3_WRITE, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (req), + NFS3_WRITE, stat, -ret, + cs->resolvedloc.path); nfs3_write_reply (req, stat, 0, stable, 0, NULL, NULL); nfs3_call_state_wipe (cs); ret = 0; @@ -2443,18 +2424,15 @@ nfs3svc_create_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, - NFS_MSG_CREATE_SETATTR_CBK, "%x: %s => -1 (%s)", - rpcsvc_request_xid (cs->req), cs->resolvedloc.path, - strerror (op_errno)); stat = nfs3_cbk_errno_status (op_ret, op_errno); goto nfs3err; } stat = NFS3_OK; nfs3err: - nfs3_log_newfh_res (rpcsvc_request_xid (cs->req), NFS3_CREATE, stat, - op_errno, &cs->fh); + nfs3_log_newfh_res (rpcsvc_request_xid (cs->req), + NFS3_CREATE, stat, op_errno, + &cs->fh, cs->resolvedloc.path); nfs3_create_reply (cs->req, stat, &cs->fh, postop, &cs->preparent, &cs->postparent); nfs3_call_state_wipe (cs); @@ -2477,9 +2455,6 @@ nfs3svc_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, NFS_MSG_CREATE_CBK, - "%x: %s => -1 (%s)", rpcsvc_request_xid (cs->req), - cs->resolvedloc.path, strerror (op_errno)); stat = nfs3_cbk_errno_status (op_ret, op_errno); goto nfs3err; } @@ -2511,8 +2486,9 @@ nfs3err: } if (ret < 0) { - nfs3_log_newfh_res (rpcsvc_request_xid (cs->req), NFS3_CREATE, - stat, op_errno, &cs->fh); + nfs3_log_newfh_res (rpcsvc_request_xid (cs->req), + NFS3_CREATE, stat, op_errno, &cs->fh, + cs->resolvedloc.path); nfs3_create_reply (cs->req, stat, &cs->fh, buf, preparent, postparent); nfs3_call_state_wipe (cs); @@ -2581,10 +2557,6 @@ nfs3svc_create_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; nfs_request_user_init (&nfu, cs->req); if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, - NFS_MSG_CREATE_STAT_CBK, "%x: %s => -1 (%s)", - rpcsvc_request_xid (cs->req), cs->resolvedloc.path, - strerror (op_errno)); ret = -op_errno; stat = nfs3_cbk_errno_status (op_ret, op_errno); goto nfs3err; @@ -2608,8 +2580,9 @@ nfs3svc_create_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_CREATE, - stat, op_errno); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_CREATE, stat, op_errno, + cs->resolvedloc.path); nfs3_create_reply (cs->req, stat, &cs->fh, buf, NULL, NULL); nfs3_call_state_wipe (cs); } @@ -2679,8 +2652,9 @@ nfs3_create_resume (void *carg) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_CREATE, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_CREATE, stat, -ret, + cs->resolvedloc.path); nfs3_create_reply (cs->req, stat, NULL, NULL, NULL, NULL); nfs3_call_state_wipe (cs); } @@ -2726,8 +2700,9 @@ nfs3_create (rpcsvc_request_t *req, struct nfs3_fh *dirfh, char *name, nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (req), NFS3_CREATE, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (req), + NFS3_CREATE, stat, -ret, + cs->resolvedloc.path); nfs3_create_reply (req, stat, NULL, NULL, NULL, NULL); nfs3_call_state_wipe (cs); ret = 0; @@ -2801,18 +2776,15 @@ nfs3svc_mkdir_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, - NFS_MSG_MKDIR_SETATTR_CBK, "%x: %s => -1 (%s)", - rpcsvc_request_xid (cs->req), cs->resolvedloc.path, - strerror (op_errno)); stat = nfs3_cbk_errno_status (op_ret, op_errno); goto nfs3err; } stat = NFS3_OK; nfs3err: - nfs3_log_newfh_res (rpcsvc_request_xid (cs->req), NFS3_MKDIR, stat, - op_errno, &cs->fh); + nfs3_log_newfh_res (rpcsvc_request_xid (cs->req), + NFS3_MKDIR, stat, op_errno, &cs->fh, + cs->resolvedloc.path); nfs3_mkdir_reply (cs->req, stat, &cs->fh, postop, &cs->preparent, &cs->postparent); nfs3_call_state_wipe (cs); @@ -2834,9 +2806,6 @@ nfs3svc_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, NFS_MSG_MKDIR_CBK, - "%x: %s => -1 (%s)", rpcsvc_request_xid (cs->req), - cs->resolvedloc.path, strerror (op_errno)); stat = nfs3_cbk_errno_status (op_ret, op_errno); goto nfs3err; } @@ -2859,8 +2828,9 @@ nfs3svc_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, nfs3err: if (ret < 0) { - nfs3_log_newfh_res (rpcsvc_request_xid (cs->req), NFS3_MKDIR, - stat, op_errno, &cs->fh); + nfs3_log_newfh_res (rpcsvc_request_xid (cs->req), + NFS3_MKDIR, stat, op_errno, &cs->fh, + cs->resolvedloc.path); nfs3_mkdir_reply (cs->req, stat, &cs->fh, buf, preparent, postparent); nfs3_call_state_wipe (cs); @@ -2898,8 +2868,9 @@ nfs3_mkdir_resume (void *carg) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_MKDIR, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_MKDIR, stat, -ret, + cs->resolvedloc.path); nfs3_mkdir_reply (cs->req, stat, NULL, NULL, NULL, NULL); nfs3_call_state_wipe (cs); } @@ -2944,8 +2915,9 @@ nfs3_mkdir (rpcsvc_request_t *req, struct nfs3_fh *dirfh, char *name, nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (req), NFS3_MKDIR, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (req), + NFS3_MKDIR, stat, -ret, + cs->resolvedloc.path); nfs3_mkdir_reply (req, stat, NULL, NULL, NULL, NULL); nfs3_call_state_wipe (cs); ret = 0; @@ -3015,9 +2987,6 @@ nfs3svc_symlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, NFS_MSG_SYMLINK_CBK, - "%x: %s => -1 (%s)", rpcsvc_request_xid (cs->req), - cs->resolvedloc.path, strerror (op_errno)); stat = nfs3_cbk_errno_status (op_ret, op_errno); goto nfs3err; } @@ -3026,8 +2995,9 @@ nfs3svc_symlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this, stat = NFS3_OK; nfs3err: - nfs3_log_newfh_res (rpcsvc_request_xid (cs->req), NFS3_SYMLINK, stat, - op_errno, &cs->fh); + nfs3_log_newfh_res (rpcsvc_request_xid (cs->req), + NFS3_SYMLINK, stat, op_errno, &cs->fh, + cs->resolvedloc.path); nfs3_symlink_reply (cs->req, stat, &cs->fh, buf, preparent, postparent); nfs3_call_state_wipe (cs); @@ -3057,7 +3027,8 @@ nfs3_symlink_resume (void *carg) nfs3err: if (ret < 0) { nfs3_log_common_res (rpcsvc_request_xid (cs->req), - NFS3_SYMLINK, stat, -ret); + NFS3_SYMLINK, stat, -ret, + cs->resolvedloc.path); nfs3_symlink_reply (cs->req, stat, NULL, NULL, NULL, NULL); nfs3_call_state_wipe (cs); } @@ -3106,8 +3077,9 @@ nfs3_symlink (rpcsvc_request_t *req, struct nfs3_fh *dirfh, char *name, nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (req), NFS3_SYMLINK, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (req), + NFS3_SYMLINK, stat, -ret, + cs->resolvedloc.path); nfs3_symlink_reply (req, stat, NULL, NULL, NULL, NULL); nfs3_call_state_wipe (cs); /* Ret must be 0 after this so that the caller does not @@ -3180,17 +3152,15 @@ nfs3svc_mknod_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, NFS_MSG_MKNOD_CBK, - "%x: %s => -1 (%s)", rpcsvc_request_xid (cs->req), - cs->resolvedloc.path, strerror (op_errno)); stat = nfs3_cbk_errno_status (op_ret, op_errno); goto nfs3err; } stat = NFS3_OK; nfs3err: - nfs3_log_newfh_res (rpcsvc_request_xid (cs->req), NFS3_MKNOD, stat, - op_errno, &cs->fh); + nfs3_log_newfh_res (rpcsvc_request_xid (cs->req), + NFS3_MKNOD, stat, op_errno, &cs->fh, + cs->resolvedloc.path); nfs3_mknod_reply (cs->req, stat, &cs->fh, postop, &cs->preparent, &cs->postparent); nfs3_call_state_wipe (cs); @@ -3212,9 +3182,6 @@ nfs3svc_mknod_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, NFS_MSG_MKNOD_CBK, - "%x: %s => -1 (%s)", rpcsvc_request_xid (cs->req), - cs->resolvedloc.path, strerror (op_errno)); stat = nfs3_cbk_errno_status (op_ret, op_errno); goto nfs3err; } @@ -3237,9 +3204,9 @@ nfs3svc_mknod_cbk (call_frame_t *frame, void *cookie, xlator_t *this, stat = nfs3_errno_to_nfsstat3 (-ret); nfs3err: if (ret < 0) { - nfs3_log_newfh_res (rpcsvc_request_xid (cs->req), NFS3_MKNOD, - stat, - op_errno, &cs->fh); + nfs3_log_newfh_res (rpcsvc_request_xid (cs->req), + NFS3_MKNOD, stat, op_errno, &cs->fh, + cs->resolvedloc.path); nfs3_mknod_reply (cs->req, stat, &cs->fh, buf, preparent, postparent); nfs3_call_state_wipe (cs); @@ -3337,8 +3304,9 @@ nfs3_mknod_resume (void *carg) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_MKNOD, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_MKNOD, stat, -ret, + cs->resolvedloc.path); nfs3_mknod_reply (cs->req, stat, NULL, NULL, NULL, NULL); nfs3_call_state_wipe (cs); } @@ -3404,8 +3372,9 @@ nfs3_mknod (rpcsvc_request_t *req, struct nfs3_fh *fh, char *name, nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (req), NFS3_MKNOD, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (req), + NFS3_MKNOD, stat, -ret, + cs->resolvedloc.path); nfs3_mknod_reply (req, stat, NULL, NULL, NULL, NULL); /* Ret must be 0 after this so that the caller does not * also send an RPC reply. @@ -3474,17 +3443,15 @@ nfs3svc_remove_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, NFS_MSG_REMOVE_CBK, - "%x: %s => -1 (%s)", rpcsvc_request_xid (cs->req), - cs->resolvedloc.path, strerror (op_errno)); stat = nfs3_cbk_errno_status (op_ret, op_errno); } if (op_ret == 0) stat = NFS3_OK; - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_REMOVE, stat, - op_errno); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_REMOVE, stat, op_errno, + cs->resolvedloc.path); nfs3_remove_reply (cs->req, stat, preparent, postparent); nfs3_call_state_wipe (cs); @@ -3532,8 +3499,9 @@ nfs3_remove_resume (void *carg) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_REMOVE, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_REMOVE, stat, -ret, + cs->resolvedloc.path); nfs3_remove_reply (cs->req, stat, NULL, NULL); nfs3_call_state_wipe (cs); } @@ -3573,8 +3541,9 @@ nfs3_remove (rpcsvc_request_t *req, struct nfs3_fh *fh, char *name) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (req), NFS3_REMOVE, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (req), + NFS3_REMOVE, stat, -ret, + cs->resolvedloc.path); nfs3_remove_reply (req, stat, NULL, NULL); nfs3_call_state_wipe (cs); /* Ret must be 0 after this so that the caller does not @@ -3651,8 +3620,9 @@ nfs3svc_rmdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, stat = NFS3_OK; } - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_RMDIR, stat, - op_errno); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_RMDIR, stat, op_errno, + cs->resolvedloc.path); nfs3_rmdir_reply (cs->req, stat, preparent, postparent); nfs3_call_state_wipe (cs); @@ -3680,8 +3650,9 @@ nfs3_rmdir_resume (void *carg) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_RMDIR, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_RMDIR, stat, -ret, + cs->resolvedloc.path); nfs3_rmdir_reply (cs->req, stat, NULL, NULL); nfs3_call_state_wipe (cs); } @@ -3722,8 +3693,9 @@ nfs3_rmdir (rpcsvc_request_t *req, struct nfs3_fh *fh, char *name) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (req), NFS3_RMDIR, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (req), + NFS3_RMDIR, stat, -ret, + cs->resolvedloc.path); nfs3_rmdir_reply (req, stat, NULL, NULL); nfs3_call_state_wipe (cs); /* Ret must be 0 after this so that the caller does not @@ -3800,18 +3772,15 @@ nfs3svc_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, NFS_MSG_RENAME_CBK, - "%x: rename %s -> %s => -1 (%s)", - rpcsvc_request_xid (cs->req), cs->oploc.path, - cs->resolvedloc.path, strerror (op_errno)); stat = nfs3_cbk_errno_status (op_ret, op_errno); goto nfs3err; } stat = NFS3_OK; nfs3err: - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_RENAME, stat, - -ret); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_RENAME, stat, + -ret, cs->resolvedloc.path); nfs3_rename_reply (cs->req, stat, buf, preoldparent, postoldparent, prenewparent, postnewparent); nfs3_call_state_wipe (cs); @@ -3841,8 +3810,9 @@ nfs3_rename_resume_dst (void *carg) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_RENAME, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_RENAME, stat, -ret, + cs->resolvedloc.path); nfs3_rename_reply (cs->req, stat, NULL, NULL, NULL, NULL, NULL); nfs3_call_state_wipe (cs); } @@ -3878,8 +3848,9 @@ nfs3_rename_resume_src (void *carg) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_RENAME, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_RENAME, stat, -ret, + cs->resolvedloc.path); nfs3_rename_reply (cs->req, stat, NULL, NULL, NULL, NULL, NULL); nfs3_call_state_wipe (cs); } @@ -3934,8 +3905,9 @@ nfs3_rename (rpcsvc_request_t *req, struct nfs3_fh *olddirfh, char *oldname, nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (req), NFS3_RENAME, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (req), + NFS3_RENAME, stat, -ret, + cs->resolvedloc.path); nfs3_rename_reply (req, stat, NULL, NULL, NULL, NULL, NULL); nfs3_call_state_wipe (cs); /* Ret must be 0 after this so that the caller does not @@ -4008,16 +3980,13 @@ nfs3svc_link_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, NFS_MSG_LINK_CBK, - "%x: link %s <- %s => -1 (%s)", - rpcsvc_request_xid (cs->req), cs->oploc.path, - cs->resolvedloc.path, strerror (op_errno)); stat = nfs3_cbk_errno_status (op_ret, op_errno); } else stat = NFS3_OK; - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_LINK, stat, - op_errno); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_LINK, stat, op_errno, + cs->resolvedloc.path); nfs3_link_reply (cs->req, stat, buf, preparent, postparent); nfs3_call_state_wipe (cs); @@ -4047,8 +4016,9 @@ nfs3_link_resume_lnk (void *carg) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_LINK, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_LINK, stat, -ret, + cs->resolvedloc.path); nfs3_link_reply (cs->req, stat, NULL, NULL, NULL); nfs3_call_state_wipe (cs); } @@ -4078,8 +4048,9 @@ nfs3_link_resume_tgt (void *carg) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_LINK, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_LINK, stat, -ret, + cs->resolvedloc.path); nfs3_link_reply (cs->req, stat, NULL, NULL, NULL); nfs3_call_state_wipe (cs); } @@ -4128,8 +4099,9 @@ nfs3_link (rpcsvc_request_t *req, struct nfs3_fh *targetfh, nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (req), NFS3_LINK, stat, - -ret); + nfs3_log_common_res (rpcsvc_request_xid (req), + NFS3_LINK, stat, + -ret, cs->resolvedloc.path); nfs3_link_reply (req, stat, NULL, NULL, NULL); nfs3_call_state_wipe (cs); /* Ret must be 0 after this so that the caller does not @@ -4222,10 +4194,6 @@ nfs3svc_readdir_fstat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, - NFS_MSG_READDIR_FSTAT_CBK, - "%x: %s => -1 (%s)", rpcsvc_request_xid (cs->req), - cs->resolvedloc.path, strerror (op_errno)); stat = nfs3_cbk_errno_status (op_ret, op_errno); goto nfs3err; } @@ -4245,16 +4213,18 @@ nfs3svc_readdir_fstat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, nfs3err: if (cs->maxcount == 0) { - nfs3_log_readdir_res (rpcsvc_request_xid (cs->req), stat, - op_errno, (uintptr_t)cs->fd, - cs->dircount, is_eof); + nfs3_log_readdir_res (rpcsvc_request_xid (cs->req), + stat, op_errno, (uintptr_t)cs->fd, + cs->dircount, is_eof, + cs->resolvedloc.path); nfs3_readdir_reply (cs->req, stat, &cs->parent, (uintptr_t)cs->fd, buf, &cs->entries, cs->dircount, is_eof); } else { - nfs3_log_readdirp_res (rpcsvc_request_xid (cs->req), stat, - op_errno, (uintptr_t)cs->fd, - cs->dircount, cs->maxcount, is_eof); + nfs3_log_readdirp_res (rpcsvc_request_xid (cs->req), + stat, op_errno, (uintptr_t)cs->fd, + cs->dircount, cs->maxcount, is_eof, + cs->resolvedloc.path); nfs3_readdirp_reply (cs->req, stat, &cs->parent, (uintptr_t)cs->fd, buf, &cs->entries, cs->dircount, @@ -4282,9 +4252,6 @@ nfs3svc_readdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, NFS_MSG_READDIR_CBK, - "%x: %s => -1 (%s)", rpcsvc_request_xid (cs->req), - cs->resolvedloc.path, strerror (op_errno)); stat = nfs3_cbk_errno_status (op_ret, op_errno); goto err; } @@ -4306,11 +4273,13 @@ err: if (cs->maxcount == 0) { nfs3_log_common_res (rpcsvc_request_xid (cs->req), - NFS3_READDIR, stat, op_errno); + NFS3_READDIR, stat, op_errno, + cs->resolvedloc.path); nfs3_readdir_reply (cs->req, stat, NULL, 0, NULL, NULL, 0, 0); } else { nfs3_log_common_res (rpcsvc_request_xid (cs->req), - NFS3_READDIRP, stat, op_errno); + NFS3_READDIRP, stat, op_errno, + cs->resolvedloc.path); nfs3_readdirp_reply (cs->req, stat, NULL, 0, NULL, NULL, 0, 0, 0); } @@ -4366,12 +4335,14 @@ nfs3err: if (ret < 0) { if (cs->maxcount == 0) { nfs3_log_common_res (rpcsvc_request_xid (cs->req), - NFS3_READDIR, stat, -ret); + NFS3_READDIR, stat, -ret, + cs->resolvedloc.path); nfs3_readdir_reply (cs->req, stat, NULL, 0, NULL, NULL, 0, 0); } else { nfs3_log_common_res (rpcsvc_request_xid (cs->req), - NFS3_READDIRP, stat, -ret); + NFS3_READDIRP, stat, -ret, + cs->resolvedloc.path); nfs3_readdirp_reply (cs->req, stat, NULL, 0, NULL, NULL, 0, 0, 0); } @@ -4445,12 +4416,14 @@ nfs3err: if (ret < 0) { if (cs->maxcount == 0) { nfs3_log_common_res (rpcsvc_request_xid (cs->req), - NFS3_READDIR, stat, -ret); + NFS3_READDIR, stat, -ret, + cs->resolvedloc.path); nfs3_readdir_reply (cs->req, stat, NULL, 0, NULL, NULL, 0, 0); } else { nfs3_log_common_res (rpcsvc_request_xid (cs->req), - NFS3_READDIRP, stat, -ret); + NFS3_READDIRP, stat, -ret, + cs->resolvedloc.path); nfs3_readdirp_reply (cs->req, stat, NULL, 0, NULL, NULL, 0, 0, 0); } @@ -4500,12 +4473,14 @@ nfs3err: if (ret < 0) { if (maxcount == 0) { nfs3_log_common_res (rpcsvc_request_xid (req), - NFS3_READDIR, stat, -ret); + NFS3_READDIR, stat, -ret, + cs->resolvedloc.path); nfs3_readdir_reply (req, stat, NULL, 0, NULL, NULL, 0, 0); } else { nfs3_log_common_res (rpcsvc_request_xid (req), - NFS3_READDIRP, stat, -ret); + NFS3_READDIRP, stat, -ret, + cs->resolvedloc.path); nfs3_readdirp_reply (req, stat, NULL, 0, NULL, NULL, 0, 0, 0); } @@ -4616,16 +4591,13 @@ nfs3_fsstat_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, - NFS_MSG_FSSTAT_STAT_CBK, "%x: %s => -1 (%s)", - rpcsvc_request_xid (cs->req), cs->resolvedloc.path, - strerror (op_errno)); stat = nfs3_cbk_errno_status (op_ret, op_errno); } else stat = NFS3_OK; - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_FSSTAT, stat, - op_errno); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_FSSTAT, stat, + op_errno, cs->resolvedloc.path); nfs3_fsstat_reply (cs->req, stat, &cs->fsstat, buf); nfs3_call_state_wipe (cs); return 0; @@ -4644,10 +4616,6 @@ nfs3_fsstat_statfs_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, - NFS_MSG_FSSTAT_STATFS_CBK, "%x: %s => -1 (%s)", - rpcsvc_request_xid (cs->req), cs->resolvedloc.path, - strerror (op_errno)); ret = -op_errno; stat = nfs3_cbk_errno_status (op_ret, op_errno); goto err; @@ -4665,8 +4633,9 @@ nfs3_fsstat_statfs_cbk (call_frame_t *frame, void *cookie, xlator_t *this, err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_FSSTAT, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_FSSTAT, stat, -ret, + cs->resolvedloc.path); nfs3_fsstat_reply (cs->req, stat, NULL, NULL); nfs3_call_state_wipe (cs); } @@ -4697,8 +4666,9 @@ nfs3_fsstat_resume (void *carg) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_FSSTAT, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_FSSTAT, stat, -ret, + cs->resolvedloc.path); nfs3_fsstat_reply (cs->req, stat, NULL, NULL); nfs3_call_state_wipe (cs); } @@ -4736,8 +4706,9 @@ nfs3_fsstat (rpcsvc_request_t *req, struct nfs3_fh *fh) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (req), NFS3_FSSTAT, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (req), + NFS3_FSSTAT, stat, -ret, + cs->resolvedloc.path); nfs3_fsstat_reply (req, stat, NULL, NULL); nfs3_call_state_wipe (cs); /* Ret must be 0 after this so that the caller does not @@ -4808,15 +4779,13 @@ nfs3svc_fsinfo_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, NFS_MSG_FSINFO_CBK, - "%x: %s => -1 (%s)", rpcsvc_request_xid (cs->req), - cs->resolvedloc.path, strerror (op_errno)); status = nfs3_cbk_errno_status (op_ret, op_errno); }else status = NFS3_OK; - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_FSINFO, status, - op_errno); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_FSINFO, status, + op_errno, cs->resolvedloc.path); nfs3_fsinfo_reply (cs->req, status, buf); nfs3_call_state_wipe (cs); @@ -4848,8 +4817,9 @@ nfs3_fsinfo_resume (void *carg) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_FSINFO, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_FSINFO, stat, -ret, + cs->resolvedloc.path); nfs3_fsinfo_reply (cs->req, stat, NULL); nfs3_call_state_wipe (cs); } @@ -4886,8 +4856,9 @@ nfs3_fsinfo (rpcsvc_request_t *req, struct nfs3_fh *fh) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (req), NFS3_FSINFO, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (req), + NFS3_FSINFO, stat, -ret, + cs->resolvedloc.path); nfs3_fsinfo_reply (req, stat, NULL); nfs3_call_state_wipe (cs); ret = 0; @@ -4953,9 +4924,6 @@ nfs3svc_pathconf_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, NFS_MSG_PATHCONF_CBK, - "%x: %s => -1 (%s)", rpcsvc_request_xid (cs->req), - cs->resolvedloc.path, strerror (op_errno)); stat = nfs3_cbk_errno_status (op_ret, op_errno); } else { /* If stat fop failed, we can still send the other components @@ -4965,8 +4933,9 @@ nfs3svc_pathconf_cbk (call_frame_t *frame, void *cookie, xlator_t *this, stat = NFS3_OK; } - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_PATHCONF, stat, - op_errno); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_PATHCONF, stat, + op_errno, cs->resolvedloc.path); nfs3_pathconf_reply (cs->req, stat, sbuf); nfs3_call_state_wipe (cs); @@ -4995,7 +4964,8 @@ nfs3_pathconf_resume (void *carg) nfs3err: if (ret < 0) { nfs3_log_common_res (rpcsvc_request_xid (cs->req), - NFS3_PATHCONF, stat, -ret); + NFS3_PATHCONF, stat, -ret, + cs->resolvedloc.path); nfs3_pathconf_reply (cs->req, stat, NULL); nfs3_call_state_wipe (cs); } @@ -5031,8 +5001,9 @@ nfs3_pathconf (rpcsvc_request_t *req, struct nfs3_fh *fh) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (req), NFS3_PATHCONF, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (req), + NFS3_PATHCONF, stat, -ret, + cs->resolvedloc.path); nfs3_pathconf_reply (req, stat, NULL); nfs3_call_state_wipe (cs); /* Ret must be 0 after this so that the caller does not @@ -5101,16 +5072,14 @@ nfs3svc_commit_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - gf_msg (GF_NFS, GF_LOG_WARNING, op_errno, NFS_MSG_COMMIT_CBK, - "%x: %s => -1 (%s)", rpcsvc_request_xid (cs->req), - cs->resolvedloc.path, strerror (op_errno)); stat = nfs3_cbk_errno_status (op_ret, op_errno); } else stat = NFS3_OK; nfs3 = rpcsvc_request_program_private (cs->req); - nfs3_log_commit_res (rpcsvc_request_xid (cs->req), stat, op_errno, - nfs3->serverstart); + nfs3_log_commit_res (rpcsvc_request_xid (cs->req), + stat, op_errno, nfs3->serverstart, + cs->resolvedloc.path); nfs3_commit_reply (cs->req, stat, nfs3->serverstart, NULL, NULL); nfs3_call_state_wipe (cs); @@ -5145,8 +5114,9 @@ nfs3_commit_resume (void *carg) nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_COMMIT, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_COMMIT, stat, -ret, + cs->resolvedloc.path); nfs3_commit_reply (cs->req, stat, cs->nfs3state->serverstart, NULL, NULL); nfs3_call_state_wipe (cs); @@ -5181,8 +5151,9 @@ nfs3_commit_open_resume (void *carg) stat = nfs3_errno_to_nfsstat3 (-ret); nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (cs->req), NFS3_COMMIT, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (cs->req), + NFS3_COMMIT, stat, -ret, + cs->resolvedloc.path); nfs3_commit_reply (cs->req, stat, 0, NULL, NULL); nfs3_call_state_wipe (cs); } @@ -5226,8 +5197,9 @@ nfs3_commit (rpcsvc_request_t *req, struct nfs3_fh *fh, offset3 offset, nfs3err: if (ret < 0) { - nfs3_log_common_res (rpcsvc_request_xid (req), NFS3_COMMIT, - stat, -ret); + nfs3_log_common_res (rpcsvc_request_xid (req), + NFS3_COMMIT, stat, -ret, + cs->resolvedloc.path); nfs3_commit_reply (req, stat, 0, NULL, NULL); nfs3_call_state_wipe (cs); ret = 0; |