|
Lines 1-5
Link Here
|
| 1 |
--- msdosfs_vfsops.c.orig Mon Apr 10 04:32:37 2000 |
1 |
--- msdosfs_vfsops.c.orig Mon Apr 10 04:32:37 2000 |
| 2 |
+++ msdosfs_vfsops.c Wed Oct 4 00:21:29 2000 |
2 |
+++ msdosfs_vfsops.c Fri Nov 16 19:28:30 2001 |
| 3 |
@@ -48,11 +48,6 @@ |
3 |
@@ -48,11 +48,6 @@ |
| 4 |
* October 1992 |
4 |
* October 1992 |
| 5 |
*/ |
5 |
*/ |
|
Lines 31-37
Link Here
|
| 31 |
#if 1 /*def PC98*/ |
31 |
#if 1 /*def PC98*/ |
| 32 |
/* |
32 |
/* |
| 33 |
* XXX - The boot signature formatted by NEC PC-98 DOS looks like a |
33 |
* XXX - The boot signature formatted by NEC PC-98 DOS looks like a |
| 34 |
@@ -635,7 +629,7 @@ |
34 |
@@ -184,7 +178,8 @@ |
|
|
35 |
bzero((char *)mp, (u_long)sizeof(struct mount)); |
| 36 |
mp->mnt_op = &msdosfs_vfsops; |
| 37 |
mp->mnt_flag = 0; |
| 38 |
- LIST_INIT(&mp->mnt_vnodelist); |
| 39 |
+ TAILQ_INIT(&mp->mnt_nvnodelist); |
| 40 |
+ TAILQ_INIT(&mp->mnt_reservedvnlist); |
| 41 |
|
| 42 |
args.flags = 0; |
| 43 |
args.uid = 0; |
| 44 |
@@ -259,7 +254,7 @@ |
| 45 |
flags = WRITECLOSE; |
| 46 |
if (mp->mnt_flag & MNT_FORCE) |
| 47 |
flags |= FORCECLOSE; |
| 48 |
- error = vflush(mp, NULLVP, flags); |
| 49 |
+ error = vflush(mp, 0, flags); |
| 50 |
} |
| 51 |
if (!error && (mp->mnt_flag & MNT_RELOAD)) |
| 52 |
/* not yet implemented */ |
| 53 |
@@ -635,7 +630,7 @@ |
| 35 |
if (FAT12(pmp)) |
54 |
if (FAT12(pmp)) |
| 36 |
pmp->pm_fatblocksize = 3 * pmp->pm_BytesPerSec; |
55 |
pmp->pm_fatblocksize = 3 * pmp->pm_BytesPerSec; |
| 37 |
else |
56 |
else |
|
Lines 40-46
Link Here
|
| 40 |
|
59 |
|
| 41 |
pmp->pm_fatblocksec = pmp->pm_fatblocksize / DEV_BSIZE; |
60 |
pmp->pm_fatblocksec = pmp->pm_fatblocksize / DEV_BSIZE; |
| 42 |
pmp->pm_bnshift = ffs(DEV_BSIZE) - 1; |
61 |
pmp->pm_bnshift = ffs(DEV_BSIZE) - 1; |
| 43 |
@@ -987,8 +981,8 @@ |
62 |
@@ -761,7 +756,7 @@ |
|
|
63 |
flags = 0; |
| 64 |
if (mntflags & MNT_FORCE) |
| 65 |
flags |= FORCECLOSE; |
| 66 |
- error = vflush(mp, NULLVP, flags); |
| 67 |
+ error = vflush(mp, 0, flags); |
| 68 |
if (error) |
| 69 |
return error; |
| 70 |
pmp = VFSTOMSDOSFS(mp); |
| 71 |
@@ -871,7 +866,7 @@ |
| 72 |
*/ |
| 73 |
simple_lock(&mntvnode_slock); |
| 74 |
loop: |
| 75 |
- for (vp = mp->mnt_vnodelist.lh_first; vp != NULL; vp = nvp) { |
| 76 |
+ for (vp = TAILQ_FIRST(&mp->mnt_nvnodelist); vp != NULL; vp = nvp) { |
| 77 |
/* |
| 78 |
* If the vnode that we are about to sync is no longer |
| 79 |
* associated with this mount point, start over. |
| 80 |
@@ -880,7 +875,7 @@ |
| 81 |
goto loop; |
| 82 |
|
| 83 |
simple_lock(&vp->v_interlock); |
| 84 |
- nvp = vp->v_mntvnodes.le_next; |
| 85 |
+ nvp = TAILQ_NEXT(vp, v_nmntvnodes); |
| 86 |
dep = VTODE(vp); |
| 87 |
if (vp->v_type == VNON || |
| 88 |
((dep->de_flag & |
| 89 |
@@ -987,8 +982,8 @@ |
| 44 |
msdosfs_checkexp, |
90 |
msdosfs_checkexp, |
| 45 |
msdosfs_vptofh, |
91 |
msdosfs_vptofh, |
| 46 |
msdosfs_init, |
92 |
msdosfs_init, |