diff options
Diffstat (limited to 'xlators/nfs/server/src/nfs3-helpers.c')
| -rw-r--r-- | xlators/nfs/server/src/nfs3-helpers.c | 129 | 
1 files changed, 65 insertions, 64 deletions
diff --git a/xlators/nfs/server/src/nfs3-helpers.c b/xlators/nfs/server/src/nfs3-helpers.c index f7b1bb0cd65..4a5854d2b95 100644 --- a/xlators/nfs/server/src/nfs3-helpers.c +++ b/xlators/nfs/server/src/nfs3-helpers.c @@ -1607,13 +1607,14 @@ err:  void  nfs3_stat_to_errstr (uint32_t xid, char *op, nfsstat3 stat, int pstat, -                     char *errstr) +                     char *errstr, size_t len)  {          if ((!op) || (!errstr))                  return; -        sprintf (errstr, "XID: %x, %s: NFS: %d(%s), POSIX: %d(%s)", xid, op, -                 stat, nfsstat3_strerror (stat), pstat, strerror (pstat)); +        snprintf (errstr, len, "XID: %x, %s: NFS: %d(%s), POSIX: %d(%s)", +                  xid, op,stat, nfsstat3_strerror (stat), pstat, +                  strerror (pstat));  }  void @@ -1621,10 +1622,10 @@ nfs3_log_common_call (uint32_t xid, char *op, struct nfs3_fh *fh)  {          char    fhstr[1024]; -	if (THIS->ctx->log.loglevel < GF_LOG_DEBUG) -		return; +        if (THIS->ctx->log.loglevel < GF_LOG_DEBUG) +                return; -        nfs3_fh_to_str (fh, fhstr); +        nfs3_fh_to_str (fh, fhstr, sizeof (fhstr));          gf_log (GF_NFS3, GF_LOG_DEBUG, "XID: %x, %s: args: %s", xid, op,                  fhstr);  } @@ -1636,9 +1637,9 @@ nfs3_log_fh_entry_call (uint32_t xid, char *op, struct nfs3_fh *fh,  {          char    fhstr[1024]; -	if (THIS->ctx->log.loglevel < GF_LOG_DEBUG) -		return; -        nfs3_fh_to_str (fh, fhstr); +        if (THIS->ctx->log.loglevel < GF_LOG_DEBUG) +                return; +        nfs3_fh_to_str (fh, fhstr, sizeof (fhstr));          gf_log (GF_NFS3, GF_LOG_DEBUG, "XID: %x, %s: args: %s, name: %s", xid,                  op, fhstr, name);  } @@ -1651,10 +1652,10 @@ nfs3_log_rename_call (uint32_t xid, struct nfs3_fh *src, char *sname,          char    sfhstr[1024];          char    dfhstr[1024]; -	if (THIS->ctx->log.loglevel < GF_LOG_DEBUG) -		return; -        nfs3_fh_to_str (src, sfhstr); -        nfs3_fh_to_str (dst, dfhstr); +        if (THIS->ctx->log.loglevel < GF_LOG_DEBUG) +                return; +        nfs3_fh_to_str (src, sfhstr, sizeof (sfhstr)); +        nfs3_fh_to_str (dst, dfhstr, sizeof (dfhstr));          gf_log (GF_NFS3, GF_LOG_DEBUG, "XID: %x, RENAME: args: Src: %s, "                  "name: %s, Dst: %s, name: %s", xid, sfhstr, sname, dfhstr,                  dname); @@ -1672,9 +1673,9 @@ nfs3_log_create_call (uint32_t xid, struct nfs3_fh *fh, char *name,          char    unchkd[] = "UNCHECKED";          char    guarded[] = "GUARDED"; -	if (THIS->ctx->log.loglevel < GF_LOG_DEBUG) -		return; -        nfs3_fh_to_str (fh, fhstr); +        if (THIS->ctx->log.loglevel < GF_LOG_DEBUG) +                return; +        nfs3_fh_to_str (fh, fhstr, sizeof (fhstr));          if (mode == EXCLUSIVE)                  modestr = exclmode;          else if (mode == GUARDED) @@ -1697,9 +1698,9 @@ nfs3_log_mknod_call (uint32_t xid, struct nfs3_fh *fh, char *name, int type)          char    sock[] = "SOCK";          char    fifo[] = "FIFO"; -	if (THIS->ctx->log.loglevel < GF_LOG_DEBUG) -		return; -        nfs3_fh_to_str (fh, fhstr); +        if (THIS->ctx->log.loglevel < GF_LOG_DEBUG) +                return; +        nfs3_fh_to_str (fh, fhstr, sizeof (fhstr));          if (type == NF3CHR)                  modestr = chr;          else if (type == NF3BLK) @@ -1720,9 +1721,9 @@ nfs3_log_symlink_call (uint32_t xid, struct nfs3_fh *fh, char *name, char *tgt)  {          char    fhstr[1024]; -	if (THIS->ctx->log.loglevel < GF_LOG_DEBUG) -		return; -        nfs3_fh_to_str (fh, fhstr); +        if (THIS->ctx->log.loglevel < GF_LOG_DEBUG) +                return; +        nfs3_fh_to_str (fh, fhstr, sizeof (fhstr));          gf_log (GF_NFS3, GF_LOG_DEBUG, "XID: %x, SYMLINK: args: %s, name: %s,"                  " target: %s", xid, fhstr, name, tgt);  } @@ -1735,10 +1736,10 @@ nfs3_log_link_call (uint32_t xid, struct nfs3_fh *fh, char *name,          char    dfhstr[1024];          char    tfhstr[1024]; -	if (THIS->ctx->log.loglevel < GF_LOG_DEBUG) -		return; -        nfs3_fh_to_str (fh, dfhstr); -        nfs3_fh_to_str (tgt, tfhstr); +        if (THIS->ctx->log.loglevel < GF_LOG_DEBUG) +                return; +        nfs3_fh_to_str (fh, dfhstr, sizeof (dfhstr)); +        nfs3_fh_to_str (tgt, tfhstr, sizeof (tfhstr));          gf_log (GF_NFS3, GF_LOG_DEBUG, "XID: %x, LINK: args: %s, name: %s,"                  " target: %s", xid, dfhstr, name, tfhstr);  } @@ -1750,9 +1751,9 @@ nfs3_log_rw_call (uint32_t xid, char *op, struct nfs3_fh *fh, offset3 offt,  {          char    fhstr[1024]; -	if (THIS->ctx->log.loglevel < GF_LOG_DEBUG) -		return; -        nfs3_fh_to_str (fh, fhstr); +        if (THIS->ctx->log.loglevel < GF_LOG_DEBUG) +                return; +        nfs3_fh_to_str (fh, fhstr, sizeof (fhstr));          if (stablewrite == -1)                  gf_log (GF_NFS3, GF_LOG_DEBUG, "XID: %x, %s: args: %s, offset:"                          " %"PRIu64",  count: %"PRIu32, xid, op, fhstr, offt, @@ -3383,11 +3384,11 @@ void  nfs3_log_common_res (uint32_t xid, int op, nfsstat3 stat, int pstat)  {          char    errstr[1024]; -	int	ll = nfs3_loglevel (op, stat); +        int     ll = nfs3_loglevel (op, stat); -	if (THIS->ctx->log.loglevel < ll) -		return; -        nfs3_stat_to_errstr (xid, nfs3op_strings[op].str, stat, pstat, errstr); +        if (THIS->ctx->log.loglevel < ll) +                return; +        nfs3_stat_to_errstr (xid, nfs3op_strings[op].str, stat, pstat, errstr, sizeof (errstr));          gf_log (GF_NFS3, ll, "%s", errstr);  } @@ -3395,14 +3396,14 @@ void  nfs3_log_readlink_res (uint32_t xid, nfsstat3 stat, int pstat, char *linkpath)  {          char    errstr[1024]; -	int	ll = nfs3_loglevel (NFS3_READLINK, stat); +        int     ll = nfs3_loglevel (NFS3_READLINK, stat); -	if (THIS->ctx->log.loglevel < ll) -		return; +        if (THIS->ctx->log.loglevel < ll) +                return; -        nfs3_stat_to_errstr (xid, "READLINK", stat, pstat, errstr); +        nfs3_stat_to_errstr (xid, "READLINK", stat, pstat, errstr, sizeof (errstr));          gf_log (GF_NFS3, ll, "%s, target: %s", -		errstr, linkpath); +                errstr, linkpath);  } @@ -3411,12 +3412,12 @@ nfs3_log_read_res (uint32_t xid, nfsstat3 stat, int pstat, count3 count,                     int is_eof, struct iovec *vec, int32_t veccount)  {          char    errstr[1024]; -	int	ll = GF_LOG_DEBUG; +        int     ll = GF_LOG_DEBUG;  	ll = nfs3_loglevel (NFS3_READ, stat); -	if (THIS->ctx->log.loglevel < ll) -		return; -        nfs3_stat_to_errstr (xid, "READ", stat, pstat, errstr); +        if (THIS->ctx->log.loglevel < ll) +                return; +        nfs3_stat_to_errstr (xid, "READ", stat, pstat, errstr, sizeof (errstr));          if (vec)                  gf_log (GF_NFS3, ll, "%s, count: %"PRIu32", is_eof:"                          " %d, vector: count: %d, len: %zd", errstr, count, @@ -3432,12 +3433,12 @@ nfs3_log_write_res (uint32_t xid, nfsstat3 stat, int pstat, count3 count,                      int stable, uint64_t wverf)  {          char    errstr[1024]; -	int	ll = nfs3_loglevel (NFS3_WRITE, stat); +        int     ll = nfs3_loglevel (NFS3_WRITE, stat); -	if (THIS->ctx->log.loglevel < ll) -		return; +        if (THIS->ctx->log.loglevel < ll) +                 return; -        nfs3_stat_to_errstr (xid, "WRITE", stat, pstat, errstr); +        nfs3_stat_to_errstr (xid, "WRITE", stat, pstat, errstr, sizeof (errstr));          gf_log (GF_NFS3, ll, "%s, count: %"PRIu32", %s,wverf: %"PRIu64                  , errstr, count, (stable == UNSTABLE)?"UNSTABLE":"STABLE",                  wverf); @@ -3450,12 +3451,12 @@ nfs3_log_newfh_res (uint32_t xid, int op, nfsstat3 stat, int pstat,  {          char    errstr[1024];          char    fhstr[1024]; -	int	ll = nfs3_loglevel (op, stat); +        int     ll = nfs3_loglevel (op, stat); -	if (THIS->ctx->log.loglevel < ll) -		return; -        nfs3_stat_to_errstr (xid, nfs3op_strings[op].str, stat, pstat, errstr); -        nfs3_fh_to_str (newfh, fhstr); +        if (THIS->ctx->log.loglevel < ll) +                return; +        nfs3_stat_to_errstr (xid, nfs3op_strings[op].str, stat, pstat, errstr, sizeof (errstr)); +        nfs3_fh_to_str (newfh, fhstr, sizeof (fhstr));          gf_log (GF_NFS3, nfs3_loglevel (op, stat), "%s, %s", errstr, fhstr);  } @@ -3466,11 +3467,11 @@ nfs3_log_readdir_res (uint32_t xid, nfsstat3 stat, int pstat, uint64_t cverf,                        count3 count, int is_eof)  {          char    errstr[1024]; -	int	ll = nfs3_loglevel (NFS3_READDIR, stat); +        int     ll = nfs3_loglevel (NFS3_READDIR, stat); -	if (THIS->ctx->log.loglevel < ll) -		return; -        nfs3_stat_to_errstr (xid, "READDIR", stat, pstat, errstr); +        if (THIS->ctx->log.loglevel < ll) +                return; +        nfs3_stat_to_errstr (xid, "READDIR", stat, pstat, errstr, sizeof (errstr));          gf_log (GF_NFS3, ll, "%s, count: %"PRIu32", cverf: %"PRIu64                  ", is_eof: %d", errstr, count, cverf, is_eof);  } @@ -3483,9 +3484,9 @@ nfs3_log_readdirp_res (uint32_t xid, nfsstat3 stat, int pstat, uint64_t cverf,          char    errstr[1024];  	int	ll = nfs3_loglevel (NFS3_READDIRP, stat); -	if (THIS->ctx->log.loglevel < ll) -		return; -        nfs3_stat_to_errstr (xid, "READDIRPLUS", stat, pstat, errstr); +        if (THIS->ctx->log.loglevel < ll) +                return; +        nfs3_stat_to_errstr (xid, "READDIRPLUS", stat, pstat, errstr, sizeof (errstr));          gf_log (GF_NFS3, ll, "%s, dircount: %"PRIu32", maxcount: %"                  PRIu32", cverf: %"PRIu64", is_eof: %d", errstr, dircount,                  maxcount, cverf, is_eof); @@ -3498,9 +3499,9 @@ nfs3_log_commit_res (uint32_t xid, nfsstat3 stat, int pstat, uint64_t wverf)          char    errstr[1024];  	int	ll = nfs3_loglevel (NFS3_COMMIT, stat); -	if (THIS->ctx->log.loglevel < ll) -		return; -        nfs3_stat_to_errstr (xid, "COMMIT", stat, pstat, errstr); +        if (THIS->ctx->log.loglevel < ll) +                return; +        nfs3_stat_to_errstr (xid, "COMMIT", stat, pstat, errstr, sizeof (errstr));          gf_log (GF_NFS3, ll, "%s, wverf: %"PRIu64, errstr, wverf);  } @@ -3511,10 +3512,10 @@ nfs3_log_readdir_call (uint32_t xid, struct nfs3_fh *fh, count3 dircount,  {          char    fhstr[1024]; -	if (THIS->ctx->log.loglevel < GF_LOG_DEBUG) -		return; +        if (THIS->ctx->log.loglevel < GF_LOG_DEBUG) +                return; -        nfs3_fh_to_str (fh, fhstr); +        nfs3_fh_to_str (fh, fhstr, sizeof (fhstr));          if (maxcount == 0)                  gf_log (GF_NFS3, GF_LOG_DEBUG, "XID: %x, READDIR: args: %s,"  | 
