From owner-freebsd-ports Fri Feb 1 19:40:24 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A183837B419 for ; Fri, 1 Feb 2002 19:40:00 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g123e0q87040; Fri, 1 Feb 2002 19:40:00 -0800 (PST) (envelope-from gnats) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EB44037B405 for ; Fri, 1 Feb 2002 19:32:19 -0800 (PST) Received: (from nobody@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g123WJO86191; Fri, 1 Feb 2002 19:32:19 -0800 (PST) (envelope-from nobody) Message-Id: <200202020332.g123WJO86191@freefall.freebsd.org> Date: Fri, 1 Feb 2002 19:32:19 -0800 (PST) From: Hye-Shik Chang To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/34546: Fix port: korean/msdosfs Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 34546 >Category: ports >Synopsis: Fix port: korean/msdosfs >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Feb 01 19:40:00 PST 2002 >Closed-Date: >Last-Modified: >Originator: Hye-Shik Chang >Release: FreeBSD 4.5 >Organization: Yonsei University >Environment: FreeBSD kornet.hanirc.org 4.5-STABLE FreeBSD 4.5-STABLE #0: Wed Jan 30 00:21:52 KST 2002 root@kornet.hanirc.org:/home/obj/home/src/sys/HANIRC i386 >Description: sync with ja-msdosfs to make unbroken. >How-To-Repeat: >Fix: diff -ruN msdosfs.orig/patches.4/patch-af msdosfs/patches.4/patch-af --- msdosfs.orig/patches.4/patch-af Sat Mar 24 12:48:40 2001 +++ msdosfs/patches.4/patch-af Sat Feb 2 12:14:09 2002 @@ -1,5 +1,5 @@ --- msdosfs_vfsops.c.orig Mon Apr 10 04:32:37 2000 -+++ msdosfs_vfsops.c Wed Oct 4 00:21:29 2000 ++++ msdosfs_vfsops.c Fri Nov 16 19:28:30 2001 @@ -48,11 +48,6 @@ * October 1992 */ @@ -31,7 +31,26 @@ #if 1 /*def PC98*/ /* * XXX - The boot signature formatted by NEC PC-98 DOS looks like a -@@ -635,7 +629,7 @@ +@@ -184,7 +178,8 @@ + bzero((char *)mp, (u_long)sizeof(struct mount)); + mp->mnt_op = &msdosfs_vfsops; + mp->mnt_flag = 0; +- LIST_INIT(&mp->mnt_vnodelist); ++ TAILQ_INIT(&mp->mnt_nvnodelist); ++ TAILQ_INIT(&mp->mnt_reservedvnlist); + + args.flags = 0; + args.uid = 0; +@@ -259,7 +254,7 @@ + flags = WRITECLOSE; + if (mp->mnt_flag & MNT_FORCE) + flags |= FORCECLOSE; +- error = vflush(mp, NULLVP, flags); ++ error = vflush(mp, 0, flags); + } + if (!error && (mp->mnt_flag & MNT_RELOAD)) + /* not yet implemented */ +@@ -635,7 +630,7 @@ if (FAT12(pmp)) pmp->pm_fatblocksize = 3 * pmp->pm_BytesPerSec; else @@ -40,7 +59,34 @@ pmp->pm_fatblocksec = pmp->pm_fatblocksize / DEV_BSIZE; pmp->pm_bnshift = ffs(DEV_BSIZE) - 1; -@@ -987,8 +981,8 @@ +@@ -761,7 +756,7 @@ + flags = 0; + if (mntflags & MNT_FORCE) + flags |= FORCECLOSE; +- error = vflush(mp, NULLVP, flags); ++ error = vflush(mp, 0, flags); + if (error) + return error; + pmp = VFSTOMSDOSFS(mp); +@@ -871,7 +866,7 @@ + */ + simple_lock(&mntvnode_slock); + loop: +- for (vp = mp->mnt_vnodelist.lh_first; vp != NULL; vp = nvp) { ++ for (vp = TAILQ_FIRST(&mp->mnt_nvnodelist); vp != NULL; vp = nvp) { + /* + * If the vnode that we are about to sync is no longer + * associated with this mount point, start over. +@@ -880,7 +875,7 @@ + goto loop; + + simple_lock(&vp->v_interlock); +- nvp = vp->v_mntvnodes.le_next; ++ nvp = TAILQ_NEXT(vp, v_nmntvnodes); + dep = VTODE(vp); + if (vp->v_type == VNON || + ((dep->de_flag & +@@ -987,8 +982,8 @@ msdosfs_checkexp, msdosfs_vptofh, msdosfs_init, >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message