Commit 828d8565 authored by David S. Miller's avatar David S. Miller Committed by Linus Torvalds

[INTERMEZZO]: Fix 64-bit platform warnings.

parent 3d5b7128
...@@ -82,7 +82,7 @@ static int presto_open_upcall(int minor, struct dentry *de) ...@@ -82,7 +82,7 @@ static int presto_open_upcall(int minor, struct dentry *de)
info.remote_generation = dd->remote_generation; info.remote_generation = dd->remote_generation;
} else } else
CERROR("get_fileid failed %d, ino: %Lx, fetching by name\n", rc, CERROR("get_fileid failed %d, ino: %Lx, fetching by name\n", rc,
dd->remote_ino); (unsigned long long) dd->remote_ino);
rc = izo_upc_open(minor, pathlen, path, fset->fset_name, &info); rc = izo_upc_open(minor, pathlen, path, fset->fset_name, &info);
PRESTO_FREE(buffer, PAGE_SIZE); PRESTO_FREE(buffer, PAGE_SIZE);
...@@ -380,7 +380,7 @@ static ssize_t presto_file_write(struct file *file, const char *buf, ...@@ -380,7 +380,7 @@ static ssize_t presto_file_write(struct file *file, const char *buf,
<< file->f_dentry->d_inode->i_sb->s_blocksize_bits); << file->f_dentry->d_inode->i_sb->s_blocksize_bits);
error = presto_reserve_space(fset->fset_cache, res_size); error = presto_reserve_space(fset->fset_cache, res_size);
CDEBUG(D_INODE, "Reserved %Ld for %d\n", res_size, size); CDEBUG(D_INODE, "Reserved %Ld for %Zd\n", res_size, size);
if ( error ) { if ( error ) {
EXIT; EXIT;
return -ENOSPC; return -ENOSPC;
...@@ -440,7 +440,7 @@ static ssize_t presto_file_write(struct file *file, const char *buf, ...@@ -440,7 +440,7 @@ static ssize_t presto_file_write(struct file *file, const char *buf,
fops = filter_c2cffops(cache->cache_filter); fops = filter_c2cffops(cache->cache_filter);
res = fops->write(file, buf, size, off); res = fops->write(file, buf, size, off);
if ( res != size ) { if ( res != size ) {
CDEBUG(D_FILE, "file write returns short write: size %d, res %d\n", size, res); CDEBUG(D_FILE, "file write returns short write: size %Zd, res %Zd\n", size, res);
} }
if ( (res > 0) && fdata ) if ( (res > 0) && fdata )
......
...@@ -647,8 +647,9 @@ int izo_set_fileid(struct file *dir, struct izo_ioctl_data *data) ...@@ -647,8 +647,9 @@ int izo_set_fileid(struct file *dir, struct izo_ioctl_data *data)
CDEBUG(D_FILE,"de:%p dd:%p\n", dentry, dd); CDEBUG(D_FILE,"de:%p dd:%p\n", dentry, dd);
if (dd->remote_ino != 0) { if (dd->remote_ino != 0) {
CERROR("remote_ino already set? %Lx:%Lx\n", dd->remote_ino, CERROR("remote_ino already set? %Lx:%Lx\n",
dd->remote_generation); (unsigned long long) dd->remote_ino,
(unsigned long long) dd->remote_generation);
rc = 0; rc = 0;
EXIT; EXIT;
goto out_close; goto out_close;
...@@ -656,8 +657,9 @@ int izo_set_fileid(struct file *dir, struct izo_ioctl_data *data) ...@@ -656,8 +657,9 @@ int izo_set_fileid(struct file *dir, struct izo_ioctl_data *data)
CDEBUG(D_FILE,"setting %p %p, %s to %Lx:%Lx\n", dentry, dd, CDEBUG(D_FILE,"setting %p %p, %s to %Lx:%Lx\n", dentry, dd,
buf, data->ioc_ino, buf,
data->ioc_generation); (unsigned long long) data->ioc_ino,
(unsigned long long) data->ioc_generation);
dd->remote_ino = data->ioc_ino; dd->remote_ino = data->ioc_ino;
dd->remote_generation = data->ioc_generation; dd->remote_generation = data->ioc_generation;
......
...@@ -1470,7 +1470,7 @@ int presto_clear_lml_close(struct presto_file_set *fset, loff_t lml_offset) ...@@ -1470,7 +1470,7 @@ int presto_clear_lml_close(struct presto_file_set *fset, loff_t lml_offset)
return 0; return 0;
} }
CDEBUG(D_JOURNAL, "reading prefix: off %ld, size %d\n", CDEBUG(D_JOURNAL, "reading prefix: off %ld, size %Zd\n",
(long)lml_offset, sizeof(record)); (long)lml_offset, sizeof(record));
rc = presto_fread(fset->fset_lml.fd_file, (char *)&record, rc = presto_fread(fset->fset_lml.fd_file, (char *)&record,
sizeof(record), &offset); sizeof(record), &offset);
...@@ -1621,7 +1621,7 @@ int presto_get_fileid(int minor, struct presto_file_set *fset, ...@@ -1621,7 +1621,7 @@ int presto_get_fileid(int minor, struct presto_file_set *fset,
/* journal_log_suffix expects journal_log to set this */ /* journal_log_suffix expects journal_log to set this */
suffix->recno = 0; suffix->recno = 0;
CDEBUG(D_FILE, "actual kml size: %d\n", logrecord - record); CDEBUG(D_FILE, "actual kml size: %Zd\n", logrecord - record);
CDEBUG(D_FILE, "get fileid: uid %d, gid %d, path: %s\n", uid, gid,path); CDEBUG(D_FILE, "get fileid: uid %d, gid %d, path: %s\n", uid, gid,path);
error = izo_upc_get_fileid(minor, size, record, error = izo_upc_get_fileid(minor, size, record,
......
...@@ -162,7 +162,8 @@ static int reint_close(struct kml_rec *rec, struct file *file, ...@@ -162,7 +162,8 @@ static int reint_close(struct kml_rec *rec, struct file *file,
*/ */
if (error == ENOENT) { if (error == ENOENT) {
CDEBUG(D_KML, "manually updating remote offset uuid %s" CDEBUG(D_KML, "manually updating remote offset uuid %s"
"recno %d offset %Lu\n", info.uuid, info.recno, info.kml_offset); "recno %d offset %Lu\n", info.uuid, info.recno,
(unsigned long long) info.kml_offset);
error = izo_rcvd_upd_remote(fset, info.uuid, info.recno, info.kml_offset); error = izo_rcvd_upd_remote(fset, info.uuid, info.recno, info.kml_offset);
if(error) if(error)
CERROR("izo_rcvd_upd_remote error %d\n", error); CERROR("izo_rcvd_upd_remote error %d\n", error);
...@@ -528,7 +529,7 @@ int kml_reint_rec(struct file *dir, struct izo_ioctl_data *data) ...@@ -528,7 +529,7 @@ int kml_reint_rec(struct file *dir, struct izo_ioctl_data *data)
if (rec.suffix->recno != lr_rec.lr_remote_recno + 1) { if (rec.suffix->recno != lr_rec.lr_remote_recno + 1) {
CERROR("KML record number %Lu expected, not %d\n", CERROR("KML record number %Lu expected, not %d\n",
lr_rec.lr_remote_recno + 1, (unsigned long long) (lr_rec.lr_remote_recno + 1),
rec.suffix->recno); rec.suffix->recno);
#if 0 #if 0
...@@ -632,7 +633,8 @@ int izo_get_fileid(struct file *dir, struct izo_ioctl_data *data) ...@@ -632,7 +633,8 @@ int izo_get_fileid(struct file *dir, struct izo_ioctl_data *data)
filp_close(file, 0); filp_close(file, 0);
CDEBUG(D_FILE, "%s ino %Lx, gen %Lx\n", rec.path, CDEBUG(D_FILE, "%s ino %Lx, gen %Lx\n", rec.path,
data->ioc_ino, data->ioc_generation); (unsigned long long) data->ioc_ino,
(unsigned long long) data->ioc_generation);
out: out:
if (buf) if (buf)
......
...@@ -227,7 +227,7 @@ static ssize_t presto_psdev_write(struct file *file, const char *buf, ...@@ -227,7 +227,7 @@ static ssize_t presto_psdev_write(struct file *file, const char *buf,
/* move data into response buffer. */ /* move data into response buffer. */
if (req->rq_bufsize < count) { if (req->rq_bufsize < count) {
CERROR("psdev_write: too much cnt: %d, cnt: %d, " CERROR("psdev_write: too much cnt: %d, cnt: %Zd, "
"opc: %d, uniq: %d.\n", "opc: %d, uniq: %d.\n",
req->rq_bufsize, count, hdr.opcode, hdr.unique); req->rq_bufsize, count, hdr.opcode, hdr.unique);
count = req->rq_bufsize; /* don't have more space! */ count = req->rq_bufsize; /* don't have more space! */
...@@ -281,7 +281,7 @@ static ssize_t presto_psdev_read(struct file * file, char * buf, ...@@ -281,7 +281,7 @@ static ssize_t presto_psdev_read(struct file * file, char * buf,
} }
if (count < req->rq_bufsize) { if (count < req->rq_bufsize) {
CERROR ("psdev_read: buffer too small, read %d of %d bytes\n", CERROR ("psdev_read: buffer too small, read %Zd of %d bytes\n",
count, req->rq_bufsize); count, req->rq_bufsize);
} }
...@@ -592,8 +592,8 @@ int izo_upc_upcall(int minor, int *size, struct izo_upcall_hdr *buffer, ...@@ -592,8 +592,8 @@ int izo_upc_upcall(int minor, int *size, struct izo_upcall_hdr *buffer,
req->rq_opcode, jiffies - req->rq_posttime, req->rq_opcode, jiffies - req->rq_posttime,
req->rq_unique, req->rq_rep_size); req->rq_unique, req->rq_rep_size);
CDEBUG(D_UPCALL, CDEBUG(D_UPCALL,
"..process %d woken up by Lento for req at 0x%x, data at %x\n", "..process %d woken up by Lento for req at 0x%p, data at %p\n",
current->pid, (int)req, (int)req->rq_data); current->pid, req, req->rq_data);
if (channel->uc_pid) { /* i.e. Lento is still alive */ if (channel->uc_pid) { /* i.e. Lento is still alive */
/* Op went through, interrupt or not we go on */ /* Op went through, interrupt or not we go on */
......
...@@ -142,7 +142,10 @@ int izo_upc_kml(int minor, __u64 offset, __u32 first_recno, __u64 length, __u32 ...@@ -142,7 +142,10 @@ int izo_upc_kml(int minor, __u64 offset, __u32 first_recno, __u64 length, __u32
CDEBUG(D_UPCALL, "KML: fileset %s, offset %Lu, length %Lu, " CDEBUG(D_UPCALL, "KML: fileset %s, offset %Lu, length %Lu, "
"first %u, last %d; minor %d\n", "first %u, last %d; minor %d\n",
fsetname, hdr->u_offset, hdr->u_length, hdr->u_first_recno, fsetname,
(unsigned long long) hdr->u_offset,
(unsigned long long) hdr->u_length,
hdr->u_first_recno,
hdr->u_last_recno, minor); hdr->u_last_recno, minor);
error = izo_upc_upcall(minor, &size, hdr, ASYNCHRONOUS); error = izo_upc_upcall(minor, &size, hdr, ASYNCHRONOUS);
...@@ -174,7 +177,9 @@ int izo_upc_kml_truncate(int minor, __u64 length, __u32 last_recno, char *fsetna ...@@ -174,7 +177,9 @@ int izo_upc_kml_truncate(int minor, __u64 length, __u32 last_recno, char *fsetna
CDEBUG(D_UPCALL, "KML TRUNCATE: fileset %s, length %Lu, " CDEBUG(D_UPCALL, "KML TRUNCATE: fileset %s, length %Lu, "
"last recno %d, minor %d\n", "last recno %d, minor %d\n",
fsetname, hdr->u_length, hdr->u_last_recno, minor); fsetname,
(unsigned long long) hdr->u_length,
hdr->u_last_recno, minor);
error = izo_upc_upcall(minor, &size, hdr, ASYNCHRONOUS); error = izo_upc_upcall(minor, &size, hdr, ASYNCHRONOUS);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment