lkml.org 
[lkml]   [1998]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Date
Subjectpatch for alpha warnings (pre2.1.96-1)
Here is a patch to fix some type mismatch problems on alpha.

--- ./fs/nfs/nfs2xdr.c.2 Tue Apr 14 16:53:15 1998
+++ ./fs/nfs/nfs2xdr.c Tue Apr 14 16:53:19 1998
@@ -446,7 +446,7 @@
"NFS: server %s, readdir reply truncated\n",
clnt->cl_server);
printk(KERN_WARNING "NFS: nr=%d, slots=%d, len=%d\n",
- nr, (end - p), len);
+ nr, (int)(end - p), len);
clnt->cl_flags |= NFS_CLNTF_BUFSIZE;
break;
}
--- ./fs/lockd/svcsubs.c.2 Tue Apr 14 17:34:41 1998
+++ ./fs/lockd/svcsubs.c Tue Apr 14 17:35:23 1998
@@ -54,7 +54,7 @@
u32 nfserr;

dprintk("lockd: nlm_file_lookup(%s/%ld)\n",
- kdevname(fh->fh_dev), fh->fh_ino);
+ kdevname(fh->fh_dev), (long) fh->fh_ino);

/* Lock file table */
down(&nlm_file_sema);
@@ -66,7 +66,7 @@
}

dprintk("lockd: creating file for %s/%ld\n",
- kdevname(fh->fh_dev), fh->fh_ino);
+ kdevname(fh->fh_dev), (long) fh->fh_ino);
nfserr = nlm_lck_denied_nolocks;
file = (struct nlm_file *) kmalloc(sizeof(*file), GFP_KERNEL);
if (!file)
--- ./fs/lockd/xdr.c.2 Tue Apr 14 17:35:27 1998
+++ ./fs/lockd/xdr.c Tue Apr 14 17:37:21 1998
@@ -85,8 +85,8 @@

if ((len = ntohl(*p++)) != sizeof(*f)) {
printk(KERN_NOTICE
- "lockd: bad fhandle size %x (should be %d)\n",
- len, sizeof(*f));
+ "lockd: bad fhandle size %x (should be %u)\n",
+ len, (unsigned) sizeof(*f));
return NULL;
}
memcpy(f, p, sizeof(*f));
--- ./fs/nfsd/nfsproc.c.2 Tue Apr 14 17:23:33 1998
+++ ./fs/nfsd/nfsproc.c Tue Apr 14 17:24:25 1998
@@ -51,7 +51,7 @@
struct nfsd_attrstat *resp)
{
dprintk("nfsd: GETATTR %d/%ld\n",
- SVCFH_DEV(&argp->fh), SVCFH_INO(&argp->fh));
+ SVCFH_DEV(&argp->fh), (long) SVCFH_INO(&argp->fh));

fh_copy(&resp->fh, &argp->fh);
RETURN(fh_verify(rqstp, &resp->fh, 0, MAY_NOP));
@@ -66,7 +66,7 @@
struct nfsd_attrstat *resp)
{
dprintk("nfsd: SETATTR %d/%ld, valid=%x, size=%ld\n",
- SVCFH_DEV(&argp->fh), SVCFH_INO(&argp->fh),
+ SVCFH_DEV(&argp->fh), (long) SVCFH_INO(&argp->fh),
argp->attrs.ia_valid, (long) argp->attrs.ia_size);

fh_copy(&resp->fh, &argp->fh);
@@ -86,7 +86,7 @@
int nfserr;

dprintk("nfsd: LOOKUP %d/%ld %s\n",
- SVCFH_DEV(&argp->fh), SVCFH_INO(&argp->fh), argp->name);
+ SVCFH_DEV(&argp->fh), (long) SVCFH_INO(&argp->fh), argp->name);

nfserr = nfsd_lookup(rqstp, &argp->fh, argp->name, argp->len,
&resp->fh);
@@ -130,7 +130,7 @@
int nfserr, avail;

dprintk("nfsd: READ %d/%ld %d bytes at %d\n",
- SVCFH_DEV(&argp->fh), SVCFH_INO(&argp->fh),
+ SVCFH_DEV(&argp->fh), (long) SVCFH_INO(&argp->fh),
argp->count, argp->offset);

/* Obtain buffer pointer for payload. 19 is 1 word for
@@ -167,7 +167,7 @@
int nfserr;

dprintk("nfsd: WRITE %d/%ld %d bytes at %d\n",
- SVCFH_DEV(&argp->fh), SVCFH_INO(&argp->fh),
+ SVCFH_DEV(&argp->fh), (long) SVCFH_INO(&argp->fh),
argp->len, argp->offset);

nfserr = nfsd_write(rqstp, fh_copy(&resp->fh, &argp->fh),
@@ -199,7 +199,7 @@
dev_t rdev = NODEV;

dprintk("nfsd: CREATE %d/%ld %s\n",
- SVCFH_DEV(dirfhp), SVCFH_INO(dirfhp), argp->name);
+ SVCFH_DEV(dirfhp), (long) SVCFH_INO(dirfhp), argp->name);

/* Get the directory inode */
nfserr = fh_verify(rqstp, dirfhp, S_IFDIR, MAY_EXEC);
@@ -425,7 +425,7 @@
int nfserr, count;

dprintk("nfsd: READDIR %d/%ld %d bytes at %d\n",
- SVCFH_DEV(&argp->fh), SVCFH_INO(&argp->fh),
+ SVCFH_DEV(&argp->fh), (long) SVCFH_INO(&argp->fh),
argp->count, argp->cookie);

/* Reserve buffer space for status */
--- ./fs/nfsd/nfsfh.c.2 Tue Apr 14 17:24:48 1998
+++ ./fs/nfsd/nfsfh.c Tue Apr 14 17:30:13 1998
@@ -249,7 +249,8 @@
pe->users++;
pe->reftime = jiffies;
#ifdef NFSD_PARANOIA
-printk("get_path_entry: found %s for %s/%ld\n", pe->name, kdevname(dev), ino);
+printk("get_path_entry: found %s for %s/%ld\n",
+ pe->name, kdevname(dev), (long) ino);
#endif
return pe;
}
@@ -458,7 +459,7 @@
*/
if (dirino == dirent.ino && dirino != root_ino) {
printk("lookup_inode: looping?? (ino=%ld, path=%s)\n",
- dirino, name);
+ (long) dirino, name);
goto out_root;
}
ino = dirino;
@@ -722,7 +723,7 @@
dentry = res;
#ifdef NFSD_PARANOIA
printk("find_dentry_by_ino: found %s/%s, ino=%ld\n",
-dentry->d_parent->d_name.name, dentry->d_name.name, ino);
+dentry->d_parent->d_name.name, dentry->d_name.name, (long) ino);
#endif
if (add_to_fhcache(dentry, NFSD_DIR_CACHE)) {
dget(dentry);
@@ -800,7 +801,8 @@
error = get_parent_ino(parent, &dirent);
if (error) {
#ifdef NFSD_PARANOIA
-printk("lookup_by_inode: ino %ld not found in %s\n", ino, parent->d_name.name);
+printk("lookup_by_inode: ino %ld not found in %s\n",
+ (long) ino, parent->d_name.name);
#endif
goto no_entry;
}
@@ -968,7 +970,7 @@
*/
#ifdef NFSD_PARANOIA
printk("find_fh_dentry: %s, %ld/%ld not found -- need full search!\n",
-kdevname(fh->fh_dev), fh->fh_dirino, fh->fh_ino);
+kdevname(fh->fh_dev), (long) fh->fh_dirino, (long) fh->fh_ino);
#endif
dentry = NULL;
nfsdstats.fh_stale++;
@@ -1006,7 +1008,7 @@
u32 error = 0;

dprintk("nfsd: fh_verify(exp %x/%ld cookie %p)\n",
- fh->fh_xdev, fh->fh_xino, fh->fh_dcookie);
+ fh->fh_xdev, (long) fh->fh_xino, fh->fh_dcookie);

if(fhp->fh_dverified)
goto check_type;
@@ -1092,7 +1094,7 @@
struct inode * inode = dentry->d_inode;

dprintk("nfsd: fh_compose(exp %x/%ld %s/%s, ino=%ld)\n",
- exp->ex_dev, exp->ex_ino,
+ exp->ex_dev, (long) exp->ex_ino,
dentry->d_parent->d_name.name, dentry->d_name.name,
(inode ? inode->i_ino : 0));

--- ./fs/nfsd/export.c.2 Tue Apr 14 17:33:51 1998
+++ ./fs/nfsd/export.c Tue Apr 14 17:33:21 1998
@@ -165,7 +165,7 @@

dprintk("exp_export called for %s:%s (%x/%ld fl %x).\n",
nxp->ex_client, nxp->ex_path,
- nxp->ex_dev, nxp->ex_ino, nxp->ex_flags);
+ nxp->ex_dev, (long) nxp->ex_ino, nxp->ex_flags);
dev = nxp->ex_dev;
ino = nxp->ex_ino;

@@ -363,7 +363,8 @@
while ((exp = *expp) != NULL) {
if (exp->ex_dev == nxp->ex_dev) {
if (exp->ex_ino != nxp->ex_ino) {
-printk("exp_unexport: ino mismatch, %ld not %ld\n", exp->ex_ino, nxp->ex_ino);
+printk("exp_unexport: ino mismatch, %ld not %ld\n",
+ (long) exp->ex_ino, (long) nxp->ex_ino);
break;
}
*expp = exp->ex_next;
@@ -393,7 +394,7 @@
struct dentry *dentry;
struct inode *inode;

- dprintk("nfsd: exp_rootfh(%s:%x/%ld)\n", clp->cl_ident, dev, ino);
+ dprintk("nfsd: exp_rootfh(%s:%x/%ld)\n", clp->cl_ident, dev, (long)ino);

if (!(exp = exp_get(clp, dev, ino)))
return -EPERM;
@@ -407,7 +408,7 @@
if(inode->i_dev != dev || inode->i_ino != ino) {
printk("exp_rootfh: Aieee, ino/dev mismatch\n");
printk("exp_rootfh: arg[dev(%x):ino(%ld)] inode[dev(%x):ino(%ld)]\n",
- dev, ino, inode->i_dev, inode->i_ino);
+ dev, (long) ino, inode->i_dev, inode->i_ino);
}

dget(dentry);
--- ./include/linux/kernel.h.2 Tue Apr 14 17:42:09 1998
+++ ./include/linux/kernel.h Tue Apr 14 17:42:55 1998
@@ -69,10 +69,10 @@
*/

#define NIPQUAD(addr) \
- (((addr) >> 0) & 0xff), \
- (((addr) >> 8) & 0xff), \
- (((addr) >> 16) & 0xff), \
- (((addr) >> 24) & 0xff)
+ (int)(((addr) >> 0) & 0xff), \
+ (int)(((addr) >> 8) & 0xff), \
+ (int)(((addr) >> 16) & 0xff), \
+ (int)(((addr) >> 24) & 0xff)

#endif /* __KERNEL__ */

--- ./net/sunrpc/svcsock.c.2 Tue Apr 14 17:45:32 1998
+++ ./net/sunrpc/svcsock.c Tue Apr 14 17:45:35 1998
@@ -254,9 +254,9 @@
set_fs(oldfs);
#endif

- dprintk("svc: socket %p sendto([%p %d... ], %d, %d) = %d\n",
+ dprintk("svc: socket %p sendto([%p %ld... ], %d, %d) = %d\n",
rqstp->rq_sock,
- iov[0].iov_base, iov[0].iov_len, nr,
+ iov[0].iov_base, (long) iov[0].iov_len, nr,
buflen, len);

return len;
@@ -313,8 +313,8 @@
set_fs(oldfs);
#endif

- dprintk("svc: socket %p recvfrom(%p, %d) = %d\n", rqstp->rq_sock,
- iov[0].iov_base, iov[0].iov_len, len);
+ dprintk("svc: socket %p recvfrom(%p, %ld) = %d\n", rqstp->rq_sock,
+ iov[0].iov_base, (long) iov[0].iov_len, len);

return len;
}
Alexander.


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu

\
 
 \ /
  Last update: 2005-03-22 13:42    [W:0.044 / U:0.680 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site