nfs : logging improvements

NFS log-warning messages logged twice in cbk function. Though,
the logging messages are not exactly duplicate, instead of
logging twice, they can be merged to one log message and the
other log message is removed in cbk functions.

Example:
(1)
W [nfs3.c:2075:nfs3svc_write_cbk] 0-nfs: 16f4dce6:
        /f.195 => -1 (Disk quota exceeded)
(2)
W [nfs3-helpers.c:3443:nfs3_log_write_res] 0-nfs-nfsv3:
        XID: 16f4dce6, WRITE: NFS: 69(Resource (quota)
        hard limit exceeded), POSIX: 122
        (Disk quota exceeded), count: 0, UNSTABLE,
        wverf: 1381508849

Here, the second message is more elaborative, and is similar
to (1). Since file name is not present in (2), it is added to (2)
and then removing all mesages of type (1).

        Backport of http://review.gluster.org/#/c/11936/

Cherry picked from commit 0166dca4f268f07dcbf9db7ca971ed16e296e8b7
> Change-Id: I6028ab17b23948493a065dfad92fe4984548511f
> BUG: 1254146
> Signed-off-by: Manikandan Selvaganesh <mselvaga@redhat.com>
> Reviewed-on: http://review.gluster.org/11936
> Tested-by: NetBSD Build System <jenkins@build.gluster.org>
> Reviewed-by: jiffin tony Thottan <jthottan@redhat.com>
> Tested-by: Gluster Build System <jenkins@build.gluster.com>
> Reviewed-by: Niels de Vos <ndevos@redhat.com>

Change-Id: I6028ab17b23948493a065dfad92fe4984548511f
BUG: 1262344
Signed-off-by: Manikandan Selvaganesh <mselvaga@redhat.com>
Reviewed-on: http://review.gluster.org/12162
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: jiffin tony Thottan <jthottan@redhat.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Niels de Vos <ndevos@redhat.com>

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 77b85649c56..25de6947a0d 100644
--- a/xlators/nfs/server/src/nfs-messages.h
+++ b/xlators/nfs/server/src/nfs-messages.h
@@ -53,7 +53,7 @@
 
 /*------------*/
 
-#define NFS_MSG_SVC_LOOKUP               (GLFS_NFS_BASE + 1)
+#define NFS_MSG_UNUSED_1                (GLFS_NFS_BASE + 1)
 /*!
  * @messageid
  * @diagnosis
@@ -61,7 +61,7 @@
  *
  */
 
-#define NFS_MSG_SVC_PAR_LOOKUP          (GLFS_NFS_BASE + 2)
+#define NFS_MSG_UNUSED_2                (GLFS_NFS_BASE + 2)
 /*!
  * @messageid
  * @diagnosis
@@ -109,7 +109,7 @@
  *
  */
 
-#define NFS_MSG_ACCESS_CBK              (GLFS_NFS_BASE + 8)
+#define NFS_MSG_UNUSED_8                (GLFS_NFS_BASE + 8)
 /*!
  * @messageid
  * @diagnosis
@@ -117,7 +117,7 @@
  *
  */
 
-#define NFS_MSG_READLINK_CBK            (GLFS_NFS_BASE + 9)
+#define NFS_MSG_UNUSED_9                (GLFS_NFS_BASE + 9)
 /*!
  * @messageid
  * @diagnosis
@@ -133,7 +133,7 @@
  *
  */
 
-#define NFS_MSG_READ_CBK                (GLFS_NFS_BASE + 11)
+#define NFS_MSG_UNUSED_11               (GLFS_NFS_BASE + 11)
 /*!
  * @messageid
  * @diagnosis
@@ -156,7 +156,7 @@
  *
  */
 
-#define NFS_MSG_FSYNC_CBK               (GLFS_NFS_BASE + 14)
+#define NFS_MSG_UNUSED_14               (GLFS_NFS_BASE + 14)
 /*!
  * @messageid
  * @diagnosis
@@ -164,7 +164,7 @@
  *
  */
 
-#define NFS_MSG_WRITE_CBK               (GLFS_NFS_BASE + 15)
+#define NFS_MSG_UNUSED_15               (GLFS_NFS_BASE + 15)
 /*!
  * @messageid
  * @diagnosis
@@ -188,7 +188,7 @@
  *
  */
 
-#define NFS_MSG_CREATE_SETATTR_CBK      (GLFS_NFS_BASE + 18)
+#define NFS_MSG_UNUSED_18               (GLFS_NFS_BASE + 18)
 /*!
  * @messageid
  * @diagnosis
@@ -196,7 +196,7 @@
  *
  */
 
-#define NFS_MSG_CREATE_CBK              (GLFS_NFS_BASE + 19)
+#define NFS_MSG_UNUSED_19               (GLFS_NFS_BASE + 19)
 /*!
  * @messageid
  * @diagnosis
@@ -204,7 +204,7 @@
  *
  */
 
-#define NFS_MSG_CREATE_STAT_CBK         (GLFS_NFS_BASE + 20)
+#define NFS_MSG_UNUSED_20               (GLFS_NFS_BASE + 20)
 /*!
  * @messageid
  * @diagnosis
@@ -220,7 +220,8 @@
  * @recommendedaction
  *
  */
-#define NFS_MSG_MKDIR_SETATTR_CBK       (GLFS_NFS_BASE + 22)
+
+#define NFS_MSG_UNUSED_22               (GLFS_NFS_BASE + 22)
 /*!
  * @messageid
  * @diagnosis
@@ -228,8 +229,7 @@
  *
  */
 
-
-#define NFS_MSG_MKDIR_CBK               (GLFS_NFS_BASE + 23)
+#define NFS_MSG_UNUSED_23               (GLFS_NFS_BASE + 23)
 /*!
  * @messageid
  * @diagnosis
@@ -245,7 +245,7 @@
  *
  */
 
-#define NFS_MSG_SYMLINK_CBK             (GLFS_NFS_BASE + 25)
+#define NFS_MSG_UNUSED_25               (GLFS_NFS_BASE + 25)
 /*!
  * @messageid
  * @diagnosis
@@ -261,7 +261,7 @@
  *
  */
 
-#define NFS_MSG_MKNOD_CBK               (GLFS_NFS_BASE + 27)
+#define NFS_MSG_UNUSED_27               (GLFS_NFS_BASE + 27)
 /*!
  * @messageid
  * @diagnosis
@@ -286,7 +286,7 @@
  */
 
 
-#define NFS_MSG_REMOVE_CBK              (GLFS_NFS_BASE + 30)
+#define NFS_MSG_UNUSED_30               (GLFS_NFS_BASE + 30)
 /*!
  * @messageid
  * @diagnosis
@@ -310,7 +310,7 @@
  *
  */
 
-#define NFS_MSG_RENAME_CBK              (GLFS_NFS_BASE + 33)
+#define NFS_MSG_UNUSED_33               (GLFS_NFS_BASE + 33)
 /*!
  * @messageid
  * @diagnosis
@@ -326,7 +326,7 @@
  *
  */
 
-#define NFS_MSG_LINK_CBK                (GLFS_NFS_BASE + 35)
+#define NFS_MSG_UNUSED_35               (GLFS_NFS_BASE + 35)
 /*!
  * @messageid
  * @diagnosis
@@ -342,7 +342,7 @@
  *
  */
 
-#define NFS_MSG_READDIR_FSTAT_CBK       (GLFS_NFS_BASE + 37)
+#define NFS_MSG_UNUSED_37               (GLFS_NFS_BASE + 37)
 /*!
  * @messageid
  * @diagnosis
@@ -350,7 +350,7 @@
  *
  */
 
-#define NFS_MSG_READDIR_CBK             (GLFS_NFS_BASE + 38)
+#define NFS_MSG_UNUSED_38               (GLFS_NFS_BASE + 38)
 /*!
  * @messageid
  * @diagnosis
@@ -374,7 +374,7 @@
  *
  */
 
-#define NFS_MSG_FSSTAT_STAT_CBK         (GLFS_NFS_BASE + 41)
+#define NFS_MSG_UNUSED_41               (GLFS_NFS_BASE + 41)
 /*!
  * @messageid
  * @diagnosis
@@ -382,7 +382,7 @@
  *
  */
 
-#define NFS_MSG_FSSTAT_STATFS_CBK       (GLFS_NFS_BASE + 42)
+#define NFS_MSG_UNUSED_42               (GLFS_NFS_BASE + 42)
 /*!
  * @messageid
  * @diagnosis
@@ -397,7 +397,7 @@
  *
  */
 
-#define NFS_MSG_FSINFO_CBK              (GLFS_NFS_BASE + 44)
+#define NFS_MSG_UNUSED_44               (GLFS_NFS_BASE + 44)
 /*!
  * @messageid
  * @diagnosis
@@ -413,7 +413,7 @@
  *
  */
 
-#define NFS_MSG_PATHCONF_CBK            (GLFS_NFS_BASE + 46)
+#define NFS_MSG_UNUSED_46               (GLFS_NFS_BASE + 46)
 /*!
  * @messageid
  * @diagnosis
@@ -429,7 +429,7 @@
  *
  */
 
-#define NFS_MSG_COMMIT_CBK              (GLFS_NFS_BASE + 48)
+#define NFS_MSG_UNUSED_48               (GLFS_NFS_BASE + 48)
 /*!
  * @messageid
  * @diagnosis
@@ -637,7 +637,7 @@
  *
  */
 
-#define NFS_MSG_GETATTR_LOOKUP_CBK      (GLFS_NFS_BASE + 75)
+#define NFS_MSG_UNUSED_75               (GLFS_NFS_BASE + 75)
 /*!
  * @messageid
  * @diagnosis
@@ -645,7 +645,7 @@
  *
  */
 
-#define NFS_MSG_GETATTR_STAT_CBK        (GLFS_NFS_BASE + 76)
+#define NFS_MSG_UNUSED_76               (GLFS_NFS_BASE + 76)
 /*!
  * @messageid
  * @diagnosis
@@ -669,7 +669,7 @@
  *
  */
 
-#define NFS_MSG_TRUNCATE_CBK            (GLFS_NFS_BASE + 79)
+#define NFS_MSG_UNUSED_79               (GLFS_NFS_BASE + 79)
 /*!
  * @messageid
  * @diagnosis
@@ -677,7 +677,7 @@
  *
  */
 
-#define NFS_MSG_SETATTR_STAT_CBK        (GLFS_NFS_BASE + 80)
+#define NFS_MSG_UNUSED_80               (GLFS_NFS_BASE + 80)
 /*!
  * @messageid
  * @diagnosis
@@ -709,7 +709,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 5bb34c138cf..ca56404f127 100644
--- a/xlators/nfs/server/src/nfs3-helpers.c
+++ b/xlators/nfs/server/src/nfs3-helpers.c
@@ -3387,7 +3387,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);
@@ -3396,14 +3397,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);
@@ -3413,15 +3417,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;
@@ -3432,30 +3439,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);
@@ -3466,19 +3474,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];
@@ -3490,15 +3498,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);
@@ -3508,17 +3517,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);
@@ -3528,19 +3539,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);
@@ -3549,11 +3561,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 626aa159d3a..5faa75bf191 100644
--- a/xlators/nfs/server/src/nfs3-helpers.h
+++ b/xlators/nfs/server/src/nfs3-helpers.h
@@ -250,33 +250,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 234e11408ef..75125652fcb 100644
--- a/xlators/nfs/server/src/nfs3.c
+++ b/xlators/nfs/server/src/nfs3.c
@@ -755,18 +755,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);
@@ -786,15 +783,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);
@@ -872,7 +866,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;
@@ -907,8 +902,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);
@@ -975,9 +971,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;
         }
@@ -993,8 +986,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);
 
@@ -1015,9 +1009,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;
         }
@@ -1048,7 +1039,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);
         }
@@ -1071,10 +1063,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;
         }
@@ -1097,7 +1085,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);
         }
@@ -1130,7 +1119,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);
         }
@@ -1187,8 +1177,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
@@ -1290,16 +1281,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;
         }
@@ -1315,7 +1296,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:
@@ -1342,10 +1324,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;
         }
@@ -1369,8 +1347,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);
 
@@ -1444,8 +1423,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);
         }
@@ -1491,8 +1471,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);
@@ -1540,9 +1521,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
@@ -1610,14 +1591,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);
 
@@ -1661,8 +1640,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;
@@ -1697,8 +1677,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;
@@ -1766,9 +1747,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;
         }
@@ -1776,8 +1754,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);
 
@@ -1808,7 +1787,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);
         }
@@ -1845,8 +1825,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
@@ -1938,9 +1919,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
@@ -1950,8 +1928,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);
@@ -1980,8 +1960,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);
         }
@@ -2016,8 +1997,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);
         }
@@ -2057,8 +2039,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;
@@ -2130,15 +2113,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);
@@ -2190,9 +2172,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;
         }
@@ -2201,9 +2180,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);
@@ -2289,8 +2268,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);
@@ -2336,8 +2316,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;
@@ -2448,18 +2429,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);
@@ -2482,9 +2460,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;
         }
@@ -2516,8 +2491,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);
@@ -2586,10 +2562,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;
@@ -2613,8 +2585,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);
         }
@@ -2684,8 +2657,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);
         }
@@ -2731,8 +2705,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;
@@ -2806,18 +2781,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);
@@ -2839,9 +2811,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;
         }
@@ -2864,8 +2833,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);
@@ -2903,8 +2873,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);
         }
@@ -2949,8 +2920,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;
@@ -3020,9 +2992,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;
         }
@@ -3031,8 +3000,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);
@@ -3062,7 +3032,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);
         }
@@ -3111,8 +3082,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
@@ -3185,17 +3157,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);
@@ -3217,9 +3187,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;
         }
@@ -3242,9 +3209,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);
@@ -3342,8 +3309,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);
         }
@@ -3409,8 +3377,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.
@@ -3479,17 +3448,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);
 
@@ -3537,8 +3504,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);
         }
@@ -3578,8 +3546,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
@@ -3656,8 +3625,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);
 
@@ -3685,8 +3655,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);
         }
@@ -3727,8 +3698,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
@@ -3805,18 +3777,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);
@@ -3846,8 +3815,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);
         }
@@ -3883,8 +3853,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);
         }
@@ -3939,8 +3910,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
@@ -4013,16 +3985,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);
 
@@ -4052,8 +4021,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);
         }
@@ -4083,8 +4053,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);
         }
@@ -4133,8 +4104,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
@@ -4227,10 +4199,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;
         }
@@ -4250,16 +4218,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,
@@ -4287,9 +4257,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;
         }
@@ -4311,11 +4278,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);
         }
@@ -4371,12 +4340,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);
                 }
@@ -4450,12 +4421,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);
                 }
@@ -4505,12 +4478,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);
                 }
@@ -4621,16 +4596,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;
@@ -4649,10 +4621,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;
@@ -4670,8 +4638,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);
         }
@@ -4702,8 +4671,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);
         }
@@ -4741,8 +4711,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
@@ -4813,15 +4784,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);
@@ -4853,8 +4822,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);
         }
@@ -4891,8 +4861,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;
@@ -4958,9 +4929,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
@@ -4970,8 +4938,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);
 
@@ -5000,7 +4969,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);
         }
@@ -5036,8 +5006,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
@@ -5106,16 +5077,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);
 
@@ -5150,8 +5119,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);
@@ -5186,8 +5156,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);
         }
@@ -5231,8 +5202,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;