Attachment 240341 Details for Bug 355141 – patch 7

[patch] patch 7

0017-BZ-355141-fix-more-warnings-and-errors-with-debug-b.patch (text/plain), 2.80 KB, created by Jeff Layton on 2007-10-27 11:52:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2007-10-27 11:52:25 UTC

Size: 2.80 KB

patch

obsolete

>From 981ba25da8ae0c01801e1d7fc6adde0ce7a8ae6b Mon Sep 17 00:00:00 2001
>From: Jeff Layton <jlayton@redhat.com>
>Date: Sat, 27 Oct 2007 07:08:44 -0400
>Subject: [PATCH] BZ#355141: fix more warnings and errors with debug builds
>
>Fix some warnings with SMBFS_DEBUG_* builds. This patch makes it so
>that builds with -Werror work.
>---
> fs/smbfs/file.c  |    7 ++++---
> fs/smbfs/inode.c |    2 +-
> fs/smbfs/proc.c  |    2 +-
> 3 files changed, 6 insertions(+), 5 deletions(-)
>
>diff --git a/fs/smbfs/file.c b/fs/smbfs/file.c
>index 19159dd..7525170 100644
>--- a/fs/smbfs/file.c
>+++ b/fs/smbfs/file.c
>@@ -232,7 +232,7 @@ smb_file_read(struct file * file, char __user * buf, size_t count, loff_t *ppos)
> 
> 	VERBOSE("before read, size=%ld, flags=%x, atime=%ld\n",
> 		(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_read(file, buf, count, ppos);
> out:
>@@ -266,7 +266,7 @@ smb_file_sendfile(struct file *file, loff_t *ppos,
> 	struct dentry *dentry = file->f_dentry;
> 	ssize_t status;
> 
>-	VERBOSE("file %s/%s, pos=%Ld, count=%d\n",
>+	VERBOSE("file %s/%s, pos=%Lu, count=%lu\n",
> 		DENTRY_PATH(dentry), *ppos, count);
> 
> 	status = smb_revalidate_inode(dentry);
>@@ -342,7 +342,8 @@ smb_file_write(struct file *file, const char __user *buf, size_t count, loff_t *
> 		result = generic_file_write(file, buf, count, ppos);
> 		VERBOSE("pos=%ld, size=%ld, mtime=%ld, atime=%ld\n",
> 			(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:
> 	return result;
>diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c
>index d0d3317..1e478fc 100644
>--- a/fs/smbfs/inode.c
>+++ b/fs/smbfs/inode.c
>@@ -539,7 +539,7 @@ int smb_fill_super(struct super_block *sb, void *raw_data, int silent)
> 
> 	/* Allocate the global temp buffer and some superblock helper structs */
> 	/* 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));
> 	mem = smb_kmalloc(sizeof(struct smb_ops) +
> 			  sizeof(struct smb_mount_data_kernel), GFP_KERNEL);
>diff --git a/fs/smbfs/proc.c b/fs/smbfs/proc.c
>index 79acb5c..b90724b 100644
>--- a/fs/smbfs/proc.c
>+++ b/fs/smbfs/proc.c
>@@ -2592,7 +2592,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_nsec = 0;
> 	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);
> 	/* ULONG allocation size */
> 	fattr->attr = WVAL(req->rq_data, 20);
>-- 
>1.5.2.1
>

Actions: View | Diff

Attachments on bug 355141: 240281 | 240291 | 240301 | 240311 | 240321 | 240331 | 240341 | 271431