andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NFS: type fixes: sanitize rpcgen generated typedefs

Browse Source 
Signed-off-by: Csaba Henk <csaba@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 399 (NFS translator with Mount v3 and NFS v3 support)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=399
This commit is contained in:
Csaba Henk 2010-04-07 10:05:29 +00:00 committed by Anand V. Avati
parent 24591071a3
commit d9e256b0e4
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xlators/nfs/lib/src/xdr-nfs3.c
View File

@ -39,7 +39,7 @@ xdr_int64 (XDR *xdrs, int64 *objp)
bool_t
xdr_uint32 (XDR *xdrs, uint32 *objp)
{
if (!xdr_u_long (xdrs, objp))
if (!xdr_uint32_t (xdrs, objp))
return FALSE;
return TRUE;
}
@ -47,7 +47,7 @@ xdr_uint32 (XDR *xdrs, uint32 *objp)
bool_t
xdr_int32 (XDR *xdrs, int32 *objp)
{
if (!xdr_long (xdrs, objp))
if (!xdr_int32_t (xdrs, objp))
return FALSE;
return TRUE;
}

4
xlators/nfs/lib/src/xdr-nfs3.h
View File

@ -44,8 +44,8 @@
typedef u_quad_t uint64;
typedef quad_t int64;
typedef u_long uint32;
typedef long int32;
typedef uint32_t uint32;
typedef int32_t int32;
typedef char *filename3;
typedef char *nfspath3;
typedef uint64 fileid3;

14
xlators/nfs/server/src/nfs3-helpers.c
View File

@ -2170,11 +2170,11 @@ nfs3_log_rw_call (uint32_t xid, char *op, struct nfs3_fh *fh, offset3 offt,
nfs3_fh_to_str (fh, fhstr);
if (stablewrite == -1)
gf_log (GF_NFS3, GF_LOG_DEBUG, "XID: %x, %s: args: %s, offset:"
" %"PRIu64", count: %"PRIu64, xid, op, fhstr, offt,
" %"PRIu64", count: %"PRIu32, xid, op, fhstr, offt,
count);
else
gf_log (GF_NFS3, GF_LOG_DEBUG, "XID: %x, %s: args: %s, offset:"
" %"PRIu64", count: %"PRIu64", %s", xid, op, fhstr,
" %"PRIu64", count: %"PRIu32", %s", xid, op, fhstr,
offt, count,
(stablewrite == UNSTABLE)?"UNSTABLE":"STABLE");
@ -2207,7 +2207,7 @@ nfs3_log_read_res (uint32_t xid, nfsstat3 stat, int pstat, count3 count,
char errstr[1024];
nfs3_stat_to_errstr (xid, "READ", stat, pstat, errstr);
gf_log (GF_NFS3, GF_LOG_DEBUG, "%s, count: %"PRIu64", is_eof: %d",
gf_log (GF_NFS3, GF_LOG_DEBUG, "%s, count: %"PRIu32", is_eof: %d",
errstr, count, is_eof);
}
@ -2219,7 +2219,7 @@ nfs3_log_write_res (uint32_t xid, nfsstat3 stat, int pstat, count3 count,
char errstr[1024];
nfs3_stat_to_errstr (xid, "WRITE", stat, pstat, errstr);
gf_log (GF_NFS3, GF_LOG_DEBUG, "%s, count: %"PRIu64", %s,wverf: %"PRIu64
gf_log (GF_NFS3, GF_LOG_DEBUG, "%s, count: %"PRIu32", %s,wverf: %"PRIu64
, errstr, count, (stable == UNSTABLE)?"UNSTABLE":"STABLE",
wverf);
}
@ -2246,7 +2246,7 @@ nfs3_log_readdir_res (uint32_t xid, nfsstat3 stat, int pstat, uint64_t cverf,
char errstr[1024];
nfs3_stat_to_errstr (xid, "READDIR", stat, pstat, errstr);
gf_log (GF_NFS3, GF_LOG_DEBUG, "%s, count: %"PRIu64", cverf: %"PRIu64
gf_log (GF_NFS3, GF_LOG_DEBUG, "%s, count: %"PRIu32", cverf: %"PRIu64
", is_eof: %d", errstr, count, cverf, is_eof);
}
@ -2258,8 +2258,8 @@ nfs3_log_readdirp_res (uint32_t xid, nfsstat3 stat, int pstat, uint64_t cverf,
char errstr[1024];
nfs3_stat_to_errstr (xid, "READDIRPLUS", stat, pstat, errstr);
gf_log (GF_NFS3, GF_LOG_DEBUG, "%s, dircount: %"PRIu64", maxcount: %"
PRIu64", cverf: %"PRIu64", is_eof: %d", errstr, dircount,
gf_log (GF_NFS3, GF_LOG_DEBUG, "%s, dircount: %"PRIu32", maxcount: %"
PRIu32", cverf: %"PRIu64", is_eof: %d", errstr, dircount,
maxcount, cverf, is_eof);
}