diff options
-rw-r--r-- | fs/smbfs/file.c | 7 | ||||
-rw-r--r-- | fs/smbfs/inode.c | 2 | ||||
-rw-r--r-- | fs/smbfs/proc.c | 2 | ||||
-rw-r--r-- | fs/smbfs/smbiod.c | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/fs/smbfs/file.c b/fs/smbfs/file.c index f5d14cebc75a..efbe29af3d7a 100644 --- a/fs/smbfs/file.c +++ b/fs/smbfs/file.c | |||
@@ -234,7 +234,7 @@ smb_file_aio_read(struct kiocb *iocb, const struct iovec *iov, | |||
234 | 234 | ||
235 | VERBOSE("before read, size=%ld, flags=%x, atime=%ld\n", | 235 | VERBOSE("before read, size=%ld, flags=%x, atime=%ld\n", |
236 | (long)dentry->d_inode->i_size, | 236 | (long)dentry->d_inode->i_size, |
237 | dentry->d_inode->i_flags, dentry->d_inode->i_atime); | 237 | dentry->d_inode->i_flags, dentry->d_inode->i_atime.tv_sec); |
238 | 238 | ||
239 | status = generic_file_aio_read(iocb, iov, nr_segs, pos); | 239 | status = generic_file_aio_read(iocb, iov, nr_segs, pos); |
240 | out: | 240 | out: |
@@ -269,7 +269,7 @@ smb_file_splice_read(struct file *file, loff_t *ppos, | |||
269 | struct dentry *dentry = file->f_path.dentry; | 269 | struct dentry *dentry = file->f_path.dentry; |
270 | ssize_t status; | 270 | ssize_t status; |
271 | 271 | ||
272 | VERBOSE("file %s/%s, pos=%Ld, count=%d\n", | 272 | VERBOSE("file %s/%s, pos=%Ld, count=%lu\n", |
273 | DENTRY_PATH(dentry), *ppos, count); | 273 | DENTRY_PATH(dentry), *ppos, count); |
274 | 274 | ||
275 | status = smb_revalidate_inode(dentry); | 275 | status = smb_revalidate_inode(dentry); |
@@ -363,7 +363,8 @@ smb_file_aio_write(struct kiocb *iocb, const struct iovec *iov, | |||
363 | result = generic_file_aio_write(iocb, iov, nr_segs, pos); | 363 | result = generic_file_aio_write(iocb, iov, nr_segs, pos); |
364 | VERBOSE("pos=%ld, size=%ld, mtime=%ld, atime=%ld\n", | 364 | VERBOSE("pos=%ld, size=%ld, mtime=%ld, atime=%ld\n", |
365 | (long) file->f_pos, (long) dentry->d_inode->i_size, | 365 | (long) file->f_pos, (long) dentry->d_inode->i_size, |
366 | dentry->d_inode->i_mtime, dentry->d_inode->i_atime); | 366 | dentry->d_inode->i_mtime.tv_sec, |
367 | dentry->d_inode->i_atime.tv_sec); | ||
367 | } | 368 | } |
368 | out: | 369 | out: |
369 | return result; | 370 | return result; |
diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c index ab517755ece0..9416ead0c7aa 100644 --- a/fs/smbfs/inode.c +++ b/fs/smbfs/inode.c | |||
@@ -536,7 +536,7 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent) | |||
536 | 536 | ||
537 | /* Allocate the global temp buffer and some superblock helper structs */ | 537 | /* Allocate the global temp buffer and some superblock helper structs */ |
538 | /* FIXME: move these to the smb_sb_info struct */ | 538 | /* FIXME: move these to the smb_sb_info struct */ |
539 | VERBOSE("alloc chunk = %d\n", sizeof(struct smb_ops) + | 539 | VERBOSE("alloc chunk = %lu\n", sizeof(struct smb_ops) + |
540 | sizeof(struct smb_mount_data_kernel)); | 540 | sizeof(struct smb_mount_data_kernel)); |
541 | mem = kmalloc(sizeof(struct smb_ops) + | 541 | mem = kmalloc(sizeof(struct smb_ops) + |
542 | sizeof(struct smb_mount_data_kernel), GFP_KERNEL); | 542 | sizeof(struct smb_mount_data_kernel), GFP_KERNEL); |
diff --git a/fs/smbfs/proc.c b/fs/smbfs/proc.c index feac46050619..d517a27b7f4b 100644 --- a/fs/smbfs/proc.c +++ b/fs/smbfs/proc.c | |||
@@ -2593,7 +2593,7 @@ smb_proc_getattr_ff(struct smb_sb_info *server, struct dentry *dentry, | |||
2593 | fattr->f_mtime.tv_sec = date_dos2unix(server, date, time); | 2593 | fattr->f_mtime.tv_sec = date_dos2unix(server, date, time); |
2594 | fattr->f_mtime.tv_nsec = 0; | 2594 | fattr->f_mtime.tv_nsec = 0; |
2595 | VERBOSE("name=%s, date=%x, time=%x, mtime=%ld\n", | 2595 | VERBOSE("name=%s, date=%x, time=%x, mtime=%ld\n", |
2596 | mask, date, time, fattr->f_mtime); | 2596 | mask, date, time, fattr->f_mtime.tv_sec); |
2597 | fattr->f_size = DVAL(req->rq_data, 12); | 2597 | fattr->f_size = DVAL(req->rq_data, 12); |
2598 | /* ULONG allocation size */ | 2598 | /* ULONG allocation size */ |
2599 | fattr->attr = WVAL(req->rq_data, 20); | 2599 | fattr->attr = WVAL(req->rq_data, 20); |
diff --git a/fs/smbfs/smbiod.c b/fs/smbfs/smbiod.c index 283c5720c9de..fae8e85af0ed 100644 --- a/fs/smbfs/smbiod.c +++ b/fs/smbfs/smbiod.c | |||
@@ -227,7 +227,7 @@ int smbiod_retry(struct smb_sb_info *server) | |||
227 | printk(KERN_ERR "smb_retry: signal failed [%d]\n", result); | 227 | printk(KERN_ERR "smb_retry: signal failed [%d]\n", result); |
228 | goto out; | 228 | goto out; |
229 | } | 229 | } |
230 | VERBOSE("signalled pid %d\n", pid); | 230 | VERBOSE("signalled pid %d\n", pid_nr(pid)); |
231 | 231 | ||
232 | /* FIXME: The retried requests should perhaps get a "time boost". */ | 232 | /* FIXME: The retried requests should perhaps get a "time boost". */ |
233 | 233 | ||