dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

smbfs: fix debug builds 

Fix some warnings with SMBFS_DEBUG_* builds.  This patch makes it so that
builds with -Werror don't fail.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jeff Layton 2007-11-14 17:00:18 -08:00 committed by Linus Torvalds
parent 60a0d23386
commit dbaf4c024a
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/smbfs/file.c
View File

@ -234,7 +234,7 @@ smb_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
VERBOSE("before read, size=%ld, flags=%x, atime=%ld\n", VERBOSE("before read, size=%ld, flags=%x, atime=%ld\n",
(long)dentry->d_inode->i_size, (long)dentry->d_inode->i_size,
dentry->d_inode->i_flags, dentry->d_inode->i_atime); dentry->d_inode->i_flags, dentry->d_inode->i_atime.tv_sec);
status = generic_file_aio_read(iocb, iov, nr_segs, pos); status = generic_file_aio_read(iocb, iov, nr_segs, pos);
out: out:
@ -269,7 +269,7 @@ smb_file_splice_read(struct file *file, loff_t *ppos,
struct dentry *dentry = file->f_path.dentry; struct dentry *dentry = file->f_path.dentry;
ssize_t status; ssize_t status;
VERBOSE("file %s/%s, pos=%Ld, count=%d\n", VERBOSE("file %s/%s, pos=%Ld, count=%lu\n",
DENTRY_PATH(dentry), *ppos, count); DENTRY_PATH(dentry), *ppos, count);
status = smb_revalidate_inode(dentry); status = smb_revalidate_inode(dentry);
@ -363,7 +363,8 @@ smb_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
result = generic_file_aio_write(iocb, iov, nr_segs, pos); result = generic_file_aio_write(iocb, iov, nr_segs, pos);
VERBOSE("pos=%ld, size=%ld, mtime=%ld, atime=%ld\n", VERBOSE("pos=%ld, size=%ld, mtime=%ld, atime=%ld\n",
(long) file->f_pos, (long) dentry->d_inode->i_size, (long) file->f_pos, (long) dentry->d_inode->i_size,
dentry->d_inode->i_mtime, dentry->d_inode->i_atime); dentry->d_inode->i_mtime.tv_sec,
dentry->d_inode->i_atime.tv_sec);
} }
out: out:
return result; return result;

2
fs/smbfs/inode.c
View File

@ -536,7 +536,7 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent)
/* Allocate the global temp buffer and some superblock helper structs */ /* Allocate the global temp buffer and some superblock helper structs */
/* FIXME: move these to the smb_sb_info struct */ /* FIXME: move these to the smb_sb_info struct */
VERBOSE("alloc chunk = %d\n", sizeof(struct smb_ops) + VERBOSE("alloc chunk = %lu\n", sizeof(struct smb_ops) +
sizeof(struct smb_mount_data_kernel)); sizeof(struct smb_mount_data_kernel));
mem = kmalloc(sizeof(struct smb_ops) + mem = kmalloc(sizeof(struct smb_ops) +
sizeof(struct smb_mount_data_kernel), GFP_KERNEL); sizeof(struct smb_mount_data_kernel), GFP_KERNEL);

2
fs/smbfs/proc.c
View File

@ -2593,7 +2593,7 @@ smb_proc_getattr_ff(struct smb_sb_info *server, struct dentry *dentry,
fattr->f_mtime.tv_sec = date_dos2unix(server, date, time); fattr->f_mtime.tv_sec = date_dos2unix(server, date, time);
fattr->f_mtime.tv_nsec = 0; fattr->f_mtime.tv_nsec = 0;
VERBOSE("name=%s, date=%x, time=%x, mtime=%ld\n", VERBOSE("name=%s, date=%x, time=%x, mtime=%ld\n",
mask, date, time, fattr->f_mtime); mask, date, time, fattr->f_mtime.tv_sec);
fattr->f_size = DVAL(req->rq_data, 12); fattr->f_size = DVAL(req->rq_data, 12);
/* ULONG allocation size */ /* ULONG allocation size */
fattr->attr = WVAL(req->rq_data, 20); fattr->attr = WVAL(req->rq_data, 20);

2
fs/smbfs/smbiod.c
View File

@ -227,7 +227,7 @@ int smbiod_retry(struct smb_sb_info *server)
printk(KERN_ERR "smb_retry: signal failed [%d]\n", result); printk(KERN_ERR "smb_retry: signal failed [%d]\n", result);
goto out; goto out;
} }
VERBOSE("signalled pid %d\n", pid); VERBOSE("signalled pid %d\n", pid_nr(pid));
/* FIXME: The retried requests should perhaps get a "time boost". */ /* FIXME: The retried requests should perhaps get a "time boost". */