summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaghavendra G <raghavendra@gluster.com>2010-12-13 03:34:05 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-12-14 19:42:01 -0800
commit361c804e9d70bd5a1c38eae1944635ca127c9ed9 (patch)
tree79bd0ec5c841caa3b397c8fae9e357f157222e75
parentf9b61e81eb6ffbfcd25e43191797570b07412ef4 (diff)
nfs: fix warnings due to format string mismatches during invocation of gf_log.
Signed-off-by: Raghavendra G <raghavendra@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 2211 ((re)introduce warnings for format string/parameter mismatch) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2211
-rw-r--r--xlators/nfs/server/src/nfs3-fh.c4
-rw-r--r--xlators/nfs/server/src/nfs3-helpers.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/xlators/nfs/server/src/nfs3-fh.c b/xlators/nfs/server/src/nfs3-fh.c
index 49236d609..be5a3017c 100644
--- a/xlators/nfs/server/src/nfs3-fh.c
+++ b/xlators/nfs/server/src/nfs3-fh.c
@@ -200,8 +200,8 @@ nfs3_log_fh (struct nfs3_fh *fh)
uuid_unparse (fh->gfid, gfidstr);
uuid_unparse (fh->exportid, exportidstr);
- gf_log ("nfs3-fh", GF_LOG_TRACE, "filehandle: hashcount %d, exportid %d"
- ", gfid 0x%s", fh->hashcount, exportidstr, gfidstr);
+ gf_log ("nfs3-fh", GF_LOG_TRACE, "filehandle: hashcount %d, exportid "
+ "0x%s, gfid 0x%s", fh->hashcount, exportidstr, gfidstr);
/*
for (; x < fh->hashcount; ++x)
gf_log ("FILEHANDLE", GF_LOG_TRACE, "Hash %d: %d", x,
diff --git a/xlators/nfs/server/src/nfs3-helpers.c b/xlators/nfs/server/src/nfs3-helpers.c
index 61ef1bef5..dabcdc82e 100644
--- a/xlators/nfs/server/src/nfs3-helpers.c
+++ b/xlators/nfs/server/src/nfs3-helpers.c
@@ -2940,7 +2940,7 @@ nfs3_fh_resolve_search_dir (nfs3_call_state_t *cs, gf_dirent_t *entries)
lastoff = candidate->d_off;
uuid_unparse (candidate->d_stat.ia_gfid, gfidstr);
gf_log (GF_NFS3, GF_LOG_TRACE, "Candidate: %s, gfid: %s",
- PRIu64, candidate->d_name, gfidstr);
+ candidate->d_name, gfidstr);
ret = nfs3_fh_resolve_check_entry (&cs->resolvefh, candidate,
cs->hashidx);
if (ret != GF_NFS3_FHRESOLVE_NOTFOUND)
@@ -3000,7 +3000,7 @@ nfs3_fh_resolve_inode_hard (nfs3_call_state_t *cs)
nfs_user_root_create (&nfu);
uuid_unparse (cs->resolvefh.gfid, gfidstr);
- gf_log (GF_NFS3, GF_LOG_TRACE, "FH hard resolution for: gfid 0x%s",
+ gf_log (GF_NFS3, GF_LOG_TRACE, "FH hard resolution for: gfid 0x%s"
", hashcount: %d, current hashidx %d", gfidstr,
cs->resolvefh.hashcount, cs->hashidx);
ret = nfs_root_loc_fill (cs->vol->itable, &cs->resolvedloc);