summaryrefslogtreecommitdiffstats
path: root/sys/fs/ntfs/ntfs_subr.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/fs/ntfs/ntfs_subr.c')
-rw-r--r--sys/fs/ntfs/ntfs_subr.c102
1 files changed, 53 insertions, 49 deletions
diff --git a/sys/fs/ntfs/ntfs_subr.c b/sys/fs/ntfs/ntfs_subr.c
index f3ac646..dae7777 100644
--- a/sys/fs/ntfs/ntfs_subr.c
+++ b/sys/fs/ntfs/ntfs_subr.c
@@ -84,8 +84,8 @@ int
ntfs_ntvattrrele(vap)
struct ntvattr * vap;
{
- dprintf(("ntfs_ntvattrrele: ino: %d, type: 0x%x\n",
- vap->va_ip->i_number, vap->va_type));
+ dprintf(("ntfs_ntvattrrele: ino: %ju, type: 0x%x\n",
+ (uintmax_t)vap->va_ip->i_number, vap->va_type));
ntfs_ntrele(vap->va_ip);
@@ -109,12 +109,12 @@ ntfs_findvattr(ntmp, ip, lvapp, vapp, type, name, namelen, vcn)
struct ntvattr *vap;
if((ip->i_flag & IN_LOADED) == 0) {
- dprintf(("ntfs_findvattr: node not loaded, ino: %d\n",
- ip->i_number));
+ dprintf(("ntfs_findvattr: node not loaded, ino: %ju\n",
+ (uintmax_t)ip->i_number));
error = ntfs_loadntnode(ntmp,ip);
if (error) {
- printf("ntfs_findvattr: FAILED TO LOAD INO: %d\n",
- ip->i_number);
+ printf("ntfs_findvattr: FAILED TO LOAD INO: %ju\n",
+ (uintmax_t)ip->i_number);
return (error);
}
}
@@ -169,13 +169,13 @@ ntfs_ntvattrget(
if (name) {
dprintf(("ntfs_ntvattrget: " \
- "ino: %d, type: 0x%x, name: %s, vcn: %d\n", \
- ip->i_number, type, name, (u_int32_t) vcn));
+ "ino: %ju, type: 0x%x, name: %s, vcn: %d\n", \
+ (uintmax_t)ip->i_number, type, name, (uint32_t)vcn));
namelen = strlen(name);
} else {
dprintf(("ntfs_ntvattrget: " \
- "ino: %d, type: 0x%x, vcn: %d\n", \
- ip->i_number, type, (u_int32_t) vcn));
+ "ino: %ju, type: 0x%x, vcn: %d\n", \
+ (uintmax_t)ip->i_number, type, (uint32_t)vcn));
name = "";
namelen = 0;
}
@@ -186,8 +186,8 @@ ntfs_ntvattrget(
if (!lvap) {
dprintf(("ntfs_ntvattrget: UNEXISTED ATTRIBUTE: " \
- "ino: %d, type: 0x%x, name: %s, vcn: %d\n", \
- ip->i_number, type, name, (u_int32_t) vcn));
+ "ino: %ju, type: 0x%x, name: %s, vcn: %d\n", \
+ (uintmax_t)ip->i_number, type, name, (uint32_t)vcn));
return (ENOENT);
}
/* Scan $ATTRIBUTE_LIST for requested attribute */
@@ -203,9 +203,9 @@ ntfs_ntvattrget(
for(; len > 0; aalp = nextaalp) {
dprintf(("ntfs_ntvattrget: " \
- "attrlist: ino: %d, attr: 0x%x, vcn: %d\n", \
- aalp->al_inumber, aalp->al_type, \
- (u_int32_t) aalp->al_vcnstart));
+ "attrlist: ino: %ju, attr: 0x%x, vcn: %d\n", \
+ (uintmax_t)aalp->al_inumber, aalp->al_type, \
+ (uint32_t)aalp->al_vcnstart));
if (len > aalp->reclen) {
nextaalp = NTFS_NEXTREC(aalp, struct attr_attrlist *);
@@ -219,8 +219,8 @@ ntfs_ntvattrget(
NTFS_AALPCMP(nextaalp, type, name, namelen)))
continue;
- dprintf(("ntfs_ntvattrget: attribute in ino: %d\n",
- aalp->al_inumber));
+ dprintf(("ntfs_ntvattrget: attribute in ino: %ju\n",
+ (uintmax_t)aalp->al_inumber));
/* this is not a main record, so we can't use just plain
vget() */
@@ -228,8 +228,8 @@ ntfs_ntvattrget(
NTFS_A_DATA, NULL, LK_EXCLUSIVE,
VG_EXT, curthread, &newvp);
if (error) {
- printf("ntfs_ntvattrget: CAN'T VGET INO: %d\n",
- aalp->al_inumber);
+ printf("ntfs_ntvattrget: CAN'T VGET INO: %ju\n",
+ (uintmax_t)aalp->al_inumber);
goto out;
}
newip = VTONT(newvp);
@@ -245,8 +245,8 @@ ntfs_ntvattrget(
error = ENOENT;
dprintf(("ntfs_ntvattrget: UNEXISTED ATTRIBUTE: " \
- "ino: %d, type: 0x%x, name: %.*s, vcn: %d\n", \
- ip->i_number, type, (int) namelen, name, (u_int32_t) vcn));
+ "ino: %ju, type: 0x%x, name: %.*s, vcn: %d\n", \
+ (uintmax_t)ip->i_number, type, (int)namelen, name, (uint32_t)vcn));
out:
free(alpool, M_TEMP);
return (error);
@@ -268,7 +268,8 @@ ntfs_loadntnode(
struct attr *ap;
struct ntvattr *nvap;
- dprintf(("ntfs_loadntnode: loading ino: %d\n",ip->i_number));
+ dprintf(("ntfs_loadntnode: loading ino: %ju\n",
+ (uintmax_t)ip->i_number));
mfrp = malloc(ntfs_bntob(ntmp->ntm_bpmftrec),
M_TEMP, M_WAITOK);
@@ -309,12 +310,13 @@ ntfs_loadntnode(
error = ntfs_procfixups(ntmp, NTFS_FILEMAGIC, (caddr_t)mfrp,
ntfs_bntob(ntmp->ntm_bpmftrec));
if (error) {
- printf("ntfs_loadntnode: BAD MFT RECORD %d\n",
- (u_int32_t) ip->i_number);
+ printf("ntfs_loadntnode: BAD MFT RECORD %ju\n",
+ (uintmax_t)ip->i_number);
goto out;
}
- dprintf(("ntfs_loadntnode: load attrs for ino: %d\n",ip->i_number));
+ dprintf(("ntfs_loadntnode: load attrs for ino: %ju\n",
+ (uintmax_t)ip->i_number));
off = mfrp->fr_attroff;
ap = (struct attr *) ((caddr_t)mfrp + off);
@@ -332,8 +334,8 @@ ntfs_loadntnode(
ap = (struct attr *) ((caddr_t)mfrp + off);
}
if (error) {
- printf("ntfs_loadntnode: failed to load attr ino: %d\n",
- ip->i_number);
+ printf("ntfs_loadntnode: failed to load attr ino: %ju\n",
+ (uintmax_t)ip->i_number);
goto out;
}
@@ -356,8 +358,8 @@ int
ntfs_ntget(ip)
struct ntnode *ip;
{
- dprintf(("ntfs_ntget: get ntnode %d: %p, usecount: %d\n",
- ip->i_number, ip, ip->i_usecount));
+ dprintf(("ntfs_ntget: get ntnode %ju: %p, usecount: %d\n",
+ (uintmax_t)ip->i_number, ip, ip->i_usecount));
mtx_lock(&ip->i_interlock);
ip->i_usecount++;
@@ -436,16 +438,16 @@ ntfs_ntput(ip)
{
struct ntvattr *vap;
- dprintf(("ntfs_ntput: rele ntnode %d: %p, usecount: %d\n",
- ip->i_number, ip, ip->i_usecount));
+ dprintf(("ntfs_ntput: rele ntnode %ju: %p, usecount: %d\n",
+ (uintmax_t)ip->i_number, ip, ip->i_usecount));
mtx_lock(&ip->i_interlock);
ip->i_usecount--;
#ifdef DIAGNOSTIC
if (ip->i_usecount < 0) {
- panic("ntfs_ntput: ino: %d usecount: %d \n",
- ip->i_number,ip->i_usecount);
+ panic("ntfs_ntput: ino: %ju usecount: %d \n",
+ (uintmax_t)ip->i_number, ip->i_usecount);
}
#endif
@@ -454,7 +456,8 @@ ntfs_ntput(ip)
return;
}
- dprintf(("ntfs_ntput: deallocating ntnode: %d\n", ip->i_number));
+ dprintf(("ntfs_ntput: deallocating ntnode: %ju\n",
+ (uintmax_t)ip->i_number));
if (LIST_FIRST(&ip->i_fnlist))
panic("ntfs_ntput: ntnode has fnodes\n");
@@ -483,9 +486,8 @@ ntfs_ntref(ip)
ip->i_usecount++;
mtx_unlock(&ip->i_interlock);
- dprintf(("ntfs_ntref: ino %d, usecount: %d\n",
- ip->i_number, ip->i_usecount));
-
+ dprintf(("ntfs_ntref: ino %ju, usecount: %d\n",
+ (uintmax_t)ip->i_number, ip->i_usecount));
}
/*
@@ -495,15 +497,15 @@ void
ntfs_ntrele(ip)
struct ntnode *ip;
{
- dprintf(("ntfs_ntrele: rele ntnode %d: %p, usecount: %d\n",
- ip->i_number, ip, ip->i_usecount));
+ dprintf(("ntfs_ntrele: rele ntnode %ju: %p, usecount: %d\n",
+ (uintmax_t)ip->i_number, ip, ip->i_usecount));
mtx_lock(&ip->i_interlock);
ip->i_usecount--;
if (ip->i_usecount < 0)
- panic("ntfs_ntrele: ino: %d usecount: %d \n",
- ip->i_number,ip->i_usecount);
+ panic("ntfs_ntrele: ino: %ju usecount: %d \n",
+ (uintmax_t)ip->i_number, ip->i_usecount);
mtx_unlock(&ip->i_interlock);
}
@@ -744,8 +746,8 @@ ntfs_fget(
{
struct fnode *fp;
- dprintf(("ntfs_fget: ino: %d, attrtype: 0x%x, attrname: %s\n",
- ip->i_number,attrtype, attrname?attrname:""));
+ dprintf(("ntfs_fget: ino: %ju, attrtype: 0x%x, attrname: %s\n",
+ (uintmax_t)ip->i_number, attrtype, attrname ? attrname : ""));
*fpp = NULL;
LIST_FOREACH(fp, &ip->i_fnlist, f_fnlist){
dprintf(("ntfs_fget: fnode: attrtype: %d, attrname: %s\n",
@@ -796,7 +798,8 @@ ntfs_frele(
{
struct ntnode *ip = FTONT(fp);
- dprintf(("ntfs_frele: fnode: %p for %d: %p\n", fp, ip->i_number, ip));
+ dprintf(("ntfs_frele: fnode: %p for %ju: %p\n",
+ fp, (uintmax_t)ip->i_number, ip));
dprintf(("ntfs_frele: deallocating fnode\n"));
LIST_REMOVE(fp,f_fnlist);
@@ -1126,7 +1129,8 @@ ntfs_ntreaddir(
int error = ENOENT;
u_int32_t aoff, cnum;
- dprintf(("ntfs_ntreaddir: read ino: %d, num: %d\n", ip->i_number, num));
+ dprintf(("ntfs_ntreaddir: read ino: %ju, num: %d\n",
+ (uintmax_t)ip->i_number, num));
error = ntfs_ntget(ip);
if (error)
return (error);
@@ -1294,7 +1298,7 @@ ntfs_times(
struct ntvattr *vap;
int error;
- dprintf(("ntfs_times: ino: %d...\n", ip->i_number));
+ dprintf(("ntfs_times: ino: %ju...\n", (uintmax_t)ip->i_number));
error = ntfs_ntget(ip);
if (error)
@@ -1329,7 +1333,7 @@ ntfs_filesize(
u_int64_t sz, bn;
int error;
- dprintf(("ntfs_filesize: ino: %d\n", ip->i_number));
+ dprintf(("ntfs_filesize: ino: %ju\n", (uintmax_t)ip->i_number));
error = ntfs_ntvattrget(ntmp, ip,
fp->f_attrtype, fp->f_attrname, 0, &vap);
@@ -1562,8 +1566,8 @@ ntfs_readattr(
struct ntvattr *vap;
size_t init;
- ddprintf(("ntfs_readattr: reading %d: 0x%x, from %d size %d bytes\n",
- ip->i_number, attrnum, (u_int32_t) roff, (u_int32_t) rsize));
+ ddprintf(("ntfs_readattr: reading %ju: 0x%x, from %jd size %zu bytes\n",
+ (uintmax_t)ip->i_number, attrnum, (intmax_t)roff, rsize));
error = ntfs_ntvattrget(ntmp, ip, attrnum, attrname, 0, &vap);
if (error)
OpenPOWER on IntegriCloud