From 0e63c0c72798f484bc4e0eb714bd25c8b10ef9f6 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Wed, 8 Aug 2007 00:23:40 +0000
Subject: [PATCH] Fix some remaining issues with MSDOSFS_DEBUG and add it as a
 kernel option.

---
 sys/conf/options                |  5 ++++-
 sys/config/LINT                 |  5 ++++-
 sys/vfs/msdosfs/msdosfs_vnops.c | 10 +++++-----
 sys/vfs/msdosfs/msdosfsmount.h  |  3 ++-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/sys/conf/options b/sys/conf/options
index 5cc59f6d75..c076a533e6 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,5 +1,5 @@
 # $FreeBSD: src/sys/conf/options,v 1.191.2.53 2003/06/04 17:56:58 sam Exp $
-# $DragonFly: src/sys/conf/options,v 1.67 2007/06/22 12:08:07 sephe Exp $
+# $DragonFly: src/sys/conf/options,v 1.68 2007/08/08 00:23:39 swildner Exp $
 #
 #        On the handling of kernel options
 #
@@ -436,6 +436,9 @@ NFS_MUIDHASHSIZ		opt_nfs.h
 NFS_NOSERVER		opt_nfs.h
 NFS_DEBUG		opt_nfs.h
 
+# MSDOSFS options
+MSDOSFS_DEBUG		opt_msdosfs.h
+
 # For the Bt848/Bt848A/Bt849/Bt878/Bt879 driver
 BROOKTREE_SYSTEM_DEFAULT	opt_bktr.h
 BROOKTREE_ALLOC_PAGES		opt_bktr.h
diff --git a/sys/config/LINT b/sys/config/LINT
index b9d1be947d..e22cec4de2 100644
--- a/sys/config/LINT
+++ b/sys/config/LINT
@@ -3,7 +3,7 @@
 #	as much of the source tree as it can.
 #
 # $FreeBSD: src/sys/i386/conf/LINT,v 1.749.2.144 2003/06/04 17:56:59 sam Exp $
-# $DragonFly: src/sys/config/LINT,v 1.120 2007/06/22 12:08:07 sephe Exp $
+# $DragonFly: src/sys/config/LINT,v 1.121 2007/08/08 00:23:40 swildner Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -813,6 +813,9 @@ options 	NFS_WDELAYHASHSIZ=16	# and with this
 options 	NFS_MUIDHASHSIZ=63	# Tune the size of nfsmount with this
 options 	NFS_DEBUG		# Enable NFS Debugging
 
+# MSDOSFS options:
+options		MSDOSFS_DEBUG		# Enable MSDOSFS Debugging
+
 #
 # Add support for the EXT2FS filesystem of Linux fame.  Be a bit
 # careful with this - the ext2fs code has a tendency to lag behind
diff --git a/sys/vfs/msdosfs/msdosfs_vnops.c b/sys/vfs/msdosfs/msdosfs_vnops.c
index 68139413dc..6d460e66b3 100644
--- a/sys/vfs/msdosfs/msdosfs_vnops.c
+++ b/sys/vfs/msdosfs/msdosfs_vnops.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/msdosfs/msdosfs_vnops.c,v 1.95.2.4 2003/06/13 15:05:47 trhodes Exp $ */
-/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vnops.c,v 1.48 2007/08/08 00:12:51 swildner Exp $ */
+/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vnops.c,v 1.49 2007/08/08 00:23:40 swildner Exp $ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $	*/
 
 /*-
@@ -391,8 +391,8 @@ msdosfs_setattr(struct vop_setattr_args *ap)
 	int error = 0;
 
 #ifdef MSDOSFS_DEBUG
-	kprintf("msdosfs_setattr(): vp %p, vap %p, cred %p, p %p\n",
-	    ap->a_vp, vap, cred, ap->a_td);
+	kprintf("msdosfs_setattr(): vp %p, vap %p, cred %p\n",
+	    ap->a_vp, vap, cred);
 #endif
 
 	/*
@@ -404,7 +404,7 @@ msdosfs_setattr(struct vop_setattr_args *ap)
 	    (vap->va_bytes != VNOVAL) || (vap->va_gen != VNOVAL)) {
 #ifdef MSDOSFS_DEBUG
 		kprintf("msdosfs_setattr(): returning EINVAL\n");
-		kprintf("    va_type %d, va_nlink %x, va_fsid %lx, va_fileid %lx\n",
+		kprintf("    va_type %d, va_nlink %x, va_fsid %x, va_fileid %lx\n",
 		    vap->va_type, vap->va_nlink, vap->va_fsid, vap->va_fileid);
 		kprintf("    va_blocksize %lx, va_rmajor %x, va_bytes %qx, va_gen %lx\n",
 		    vap->va_blocksize, vap->va_rmajor, vap->va_bytes, vap->va_gen);
@@ -667,7 +667,7 @@ msdosfs_write(struct vop_write_args *ap)
 
 #ifdef MSDOSFS_DEBUG
 	kprintf("msdosfs_write(vp %p, uio %p, ioflag %x, cred %p\n",
-	    vp, uio, ioflag, cred);
+	    vp, uio, ioflag, ap->a_cred);
 	kprintf("msdosfs_write(): diroff %lu, dirclust %lu, startcluster %lu\n",
 	    dep->de_diroffset, dep->de_dirclust, dep->de_StartCluster);
 #endif
diff --git a/sys/vfs/msdosfs/msdosfsmount.h b/sys/vfs/msdosfs/msdosfsmount.h
index b411258051..90ac06f9d3 100644
--- a/sys/vfs/msdosfs/msdosfsmount.h
+++ b/sys/vfs/msdosfs/msdosfsmount.h
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/msdosfs/msdosfsmount.h,v 1.20.2.2 2000/10/27 09:45:07 bde Exp $ */
-/* $DragonFly: src/sys/vfs/msdosfs/msdosfsmount.h,v 1.8 2006/09/10 01:26:41 dillon Exp $ */
+/* $DragonFly: src/sys/vfs/msdosfs/msdosfsmount.h,v 1.9 2007/08/08 00:23:40 swildner Exp $ */
 /*	$NetBSD: msdosfsmount.h,v 1.17 1997/11/17 15:37:07 ws Exp $	*/
 
 /*-
@@ -53,6 +53,7 @@
 #define	_MSDOSFS_MSDOSFSMOUNT_H_
 
 #ifdef _KERNEL
+#include "opt_msdosfs.h"
 #ifdef MALLOC_DECLARE
 MALLOC_DECLARE(M_MSDOSFSMNT);
 #endif
-- 
2.41.0