From owner-svn-src-head@freebsd.org Thu Oct 19 12:55:12 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BE4B4E3A93F; Thu, 19 Oct 2017 12:55:12 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9A636683F4; Thu, 19 Oct 2017 12:55:12 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9JCtBx6043108; Thu, 19 Oct 2017 12:55:11 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9JCtBQ0043104; Thu, 19 Oct 2017 12:55:11 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201710191255.v9JCtBQ0043104@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 19 Oct 2017 12:55:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r324753 - head/sys/fs/msdosfs X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/sys/fs/msdosfs X-SVN-Commit-Revision: 324753 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Oct 2017 12:55:12 -0000 Author: emaste Date: Thu Oct 19 12:55:11 2017 New Revision: 324753 URL: https://svnweb.freebsd.org/changeset/base/324753 Log: msdosfs: fix build with MSDOSFS_DEBUG Inspired by a patch submission by longwitz@incore.de with many changes for ino64 in HEAD. PR: 199152 MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Modified: head/sys/fs/msdosfs/msdosfs_conv.c head/sys/fs/msdosfs/msdosfs_denode.c head/sys/fs/msdosfs/msdosfs_vfsops.c head/sys/fs/msdosfs/msdosfs_vnops.c Modified: head/sys/fs/msdosfs/msdosfs_conv.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_conv.c Thu Oct 19 09:01:15 2017 (r324752) +++ head/sys/fs/msdosfs/msdosfs_conv.c Thu Oct 19 12:55:11 2017 (r324753) @@ -594,7 +594,7 @@ winChkName(struct mbnambuf *nbp, const u_char *un, siz return -1; #ifdef MSDOSFS_DEBUG - printf("winChkName(): un=%s:%d,d_name=%s:%d\n", un, unlen, + printf("winChkName(): un=%s:%zu,d_name=%s:%d\n", un, unlen, dirbuf.d_name, dirbuf.d_namlen); #endif Modified: head/sys/fs/msdosfs/msdosfs_denode.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_denode.c Thu Oct 19 09:01:15 2017 (r324752) +++ head/sys/fs/msdosfs/msdosfs_denode.c Thu Oct 19 12:55:11 2017 (r324753) @@ -590,8 +590,9 @@ msdosfs_inactive(struct vop_inactive_args *ap) * as empty. (This may not be necessary for the dos filesystem.) */ #ifdef MSDOSFS_DEBUG - printf("msdosfs_inactive(): dep %p, refcnt %ld, mntflag %x, MNT_RDONLY %x\n", - dep, dep->de_refcnt, vp->v_mount->mnt_flag, MNT_RDONLY); + printf("msdosfs_inactive(): dep %p, refcnt %ld, mntflag %llx, MNT_RDONLY %llx\n", + dep, dep->de_refcnt, (unsigned long long)vp->v_mount->mnt_flag, + (unsigned long long)MNT_RDONLY); #endif if (dep->de_refcnt <= 0 && (vp->v_mount->mnt_flag & MNT_RDONLY) == 0) { error = detrunc(dep, (u_long) 0, 0, NOCRED); Modified: head/sys/fs/msdosfs/msdosfs_vfsops.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_vfsops.c Thu Oct 19 09:01:15 2017 (r324752) +++ head/sys/fs/msdosfs/msdosfs_vfsops.c Thu Oct 19 12:55:11 2017 (r324753) @@ -75,6 +75,10 @@ #include #include +#ifdef MSDOSFS_DEBUG +#include +#endif + static const char msdosfs_lock_msg[] = "fatlk"; /* Mount options that we support. */ Modified: head/sys/fs/msdosfs/msdosfs_vnops.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_vnops.c Thu Oct 19 09:01:15 2017 (r324752) +++ head/sys/fs/msdosfs/msdosfs_vnops.c Thu Oct 19 12:55:11 2017 (r324753) @@ -348,10 +348,13 @@ msdosfs_setattr(struct vop_setattr_args *ap) (vap->va_bytes != VNOVAL) || (vap->va_gen != VNOVAL)) { #ifdef MSDOSFS_DEBUG printf("msdosfs_setattr(): returning EINVAL\n"); - printf(" va_type %d, va_nlink %x, va_fsid %lx, va_fileid %lx\n", - vap->va_type, vap->va_nlink, vap->va_fsid, vap->va_fileid); - printf(" va_blocksize %lx, va_rdev %x, va_bytes %qx, va_gen %lx\n", - vap->va_blocksize, vap->va_rdev, vap->va_bytes, vap->va_gen); + printf(" va_type %d, va_nlink %llx, va_fsid %llx, va_fileid %llx\n", + vap->va_type, (unsigned long long)vap->va_nlink, + (unsigned long long)vap->va_fsid, + (unsigned long long)vap->va_fileid); + printf(" va_blocksize %lx, va_rdev %llx, va_bytes %llx, va_gen %lx\n", + vap->va_blocksize, (unsigned long long)vap->va_rdev, + (unsigned long long)vap->va_bytes, vap->va_gen); printf(" va_uid %x, va_gid %x\n", vap->va_uid, vap->va_gid); #endif