[PATCH] smbfs: fix debug compile

From: Markus Amsler
Date: Sun Dec 26 2004 - 11:48:51 EST


Hi,

Compiling of fs/smbfs failes (gcc version 3.3.4) if you enable DSMBFS_DEBUG_VERBOSE in fs/smbfs/Makefile.This patch is against 2.610 kernel.

Markus Amsler diff -ru 2.6.10/fs/smbfs/file.c dev/fs/smbfs/file.c
--- 2.6.10/fs/smbfs/file.c 2004-12-24 22:35:27.000000000 +0100
+++ dev/fs/smbfs/file.c 2004-12-25 14:20:48.000000000 +0100
@@ -232,7 +232,7 @@

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:
@@ -342,7 +342,7 @@
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 -ru 2.6.10/fs/smbfs/inode.c dev/fs/smbfs/inode.c
--- 2.6.10/fs/smbfs/inode.c 2004-12-24 22:34:00.000000000 +0100
+++ dev/fs/smbfs/inode.c 2004-12-25 14:18:31.000000000 +0100
@@ -216,7 +216,7 @@
if (inode->i_mtime.tv_sec != last_time || inode->i_size != last_sz) {
VERBOSE("%ld changed, old=%ld, new=%ld, oz=%ld, nz=%ld\n",
inode->i_ino,
- (long) last_time, (long) inode->i_mtime,
+ (long) last_time, (long) inode->i_mtime.tv_sec,
(long) last_sz, (long) inode->i_size);

if (!S_ISDIR(inode->i_mode))
diff -ru 2.6.10/fs/smbfs/proc.c dev/fs/smbfs/proc.c
--- 2.6.10/fs/smbfs/proc.c 2004-12-24 22:34:00.000000000 +0100
+++ dev/fs/smbfs/proc.c 2004-12-25 14:22:01.000000000 +0100
@@ -2593,7 +2593,7 @@
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);