summaryrefslogtreecommitdiffstats
path: root/sys/fs/msdosfs/msdosfs_fat.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/fs/msdosfs/msdosfs_fat.c')
-rw-r--r--sys/fs/msdosfs/msdosfs_fat.c36
1 files changed, 6 insertions, 30 deletions
diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c
index 3994042..c660601 100644
--- a/sys/fs/msdosfs/msdosfs_fat.c
+++ b/sys/fs/msdosfs/msdosfs_fat.c
@@ -328,29 +328,6 @@ updatefats(pmp, bp, fatbn)
printf("updatefats(pmp %p, bp %p, fatbn %lu)\n", pmp, bp, fatbn);
#endif
- /*
- * If we have an FSInfo block, update it.
- */
- if (pmp->pm_fsinfo) {
- if (bread(pmp->pm_devvp, pmp->pm_fsinfo, pmp->pm_BytesPerSec,
- NOCRED, &bpn) != 0) {
- /*
- * Ignore the error, but turn off FSInfo update for the future.
- */
- pmp->pm_fsinfo = 0;
- brelse(bpn);
- } else {
- struct fsinfo *fp = (struct fsinfo *)bpn->b_data;
-
- putulong(fp->fsinfree, pmp->pm_freeclustercount);
- putulong(fp->fsinxtfree, pmp->pm_nxtfree);
- if (pmp->pm_flags & MSDOSFSMNT_WAITONFAT)
- bwrite(bpn);
- else
- bdwrite(bpn);
- }
- }
-
if (pmp->pm_flags & MSDOSFS_FATMIRROR) {
/*
* Now copy the block(s) of the modified fat to the other copies of
@@ -393,9 +370,6 @@ updatefats(pmp, bp, fatbn)
bwrite(bp);
else
bdwrite(bp);
- /*
- * Maybe update fsinfo sector here?
- */
}
/*
@@ -431,6 +405,7 @@ usemap_alloc(pmp, cn)
pmp->pm_inusemap[cn / N_INUSEBITS] |= 1 << (cn % N_INUSEBITS);
KASSERT(pmp->pm_freeclustercount > 0, ("usemap_alloc: too little"));
pmp->pm_freeclustercount--;
+ pmp->pm_flags |= MSDOSFS_FSIMOD;
}
static __inline void
@@ -441,6 +416,7 @@ usemap_free(pmp, cn)
MSDOSFS_ASSERT_MP_LOCKED(pmp);
pmp->pm_freeclustercount++;
+ pmp->pm_flags |= MSDOSFS_FSIMOD;
KASSERT((pmp->pm_inusemap[cn / N_INUSEBITS] & (1 << (cn % N_INUSEBITS)))
!= 0, ("Freeing unused sector %ld %ld %x", cn, cn % N_INUSEBITS,
(unsigned)pmp->pm_inusemap[cn / N_INUSEBITS]));
@@ -742,7 +718,10 @@ chainalloc(pmp, start, count, fillwith, retcluster, got)
for (cl = start, n = count; n-- > 0;)
usemap_alloc(pmp, cl++);
-
+ pmp->pm_nxtfree = start + count;
+ if (pmp->pm_nxtfree > pmp->pm_maxcluster)
+ pmp->pm_nxtfree = CLUST_FIRST;
+ pmp->pm_flags |= MSDOSFS_FSIMOD;
error = fatchain(pmp, start, count, fillwith);
if (error != 0)
return (error);
@@ -754,9 +733,6 @@ chainalloc(pmp, start, count, fillwith, retcluster, got)
*retcluster = start;
if (got)
*got = count;
- pmp->pm_nxtfree = start + count;
- if (pmp->pm_nxtfree > pmp->pm_maxcluster)
- pmp->pm_nxtfree = CLUST_FIRST;
return (0);
}
OpenPOWER on IntegriCloud