diff options
| author | kib <kib@FreeBSD.org> | 2016-11-11 19:33:26 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-11-11 19:33:26 +0000 |
| commit | c5fdb201232929dedb31afc38960cd8dd713b3fc (patch) | |
| tree | 452bb0192c8d0de881392b239582cbcb64a7f804 /sys/fs/msdosfs/msdosfs_fat.c | |
| parent | 967ccdf67deeb1cedacc8e338addcc915dd18bb6 (diff) | |
| download | FreeBSD-src-c5fdb201232929dedb31afc38960cd8dd713b3fc.zip FreeBSD-src-c5fdb201232929dedb31afc38960cd8dd713b3fc.tar.gz | |
MFC r308022:
Use symbolic name for the value of fully free word in pm_inusemap.
Diffstat (limited to 'sys/fs/msdosfs/msdosfs_fat.c')
| -rw-r--r-- | sys/fs/msdosfs/msdosfs_fat.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c index 464c105..96c9f18 100644 --- a/sys/fs/msdosfs/msdosfs_fat.c +++ b/sys/fs/msdosfs/msdosfs_fat.c @@ -60,6 +60,8 @@ #include <fs/msdosfs/fat.h> #include <fs/msdosfs/msdosfsmount.h> +#define FULL_RUN ((u_int)0xffffffff) + static int chainalloc(struct msdosfsmount *pmp, u_long start, u_long count, u_long fillwith, u_long *retcluster, u_long *got); @@ -752,8 +754,8 @@ clusteralloc1(struct msdosfsmount *pmp, u_long start, u_long count, idx = cn / N_INUSEBITS; map = pmp->pm_inusemap[idx]; map |= (1 << (cn % N_INUSEBITS)) - 1; - if (map != (u_int)-1) { - cn = idx * N_INUSEBITS + ffs(map^(u_int)-1) - 1; + if (map != FULL_RUN) { + cn = idx * N_INUSEBITS + ffs(map ^ FULL_RUN) - 1; if ((l = chainlength(pmp, cn, count)) >= count) return (chainalloc(pmp, cn, count, fillwith, retcluster, got)); if (l > foundl) { @@ -769,8 +771,8 @@ clusteralloc1(struct msdosfsmount *pmp, u_long start, u_long count, idx = cn / N_INUSEBITS; map = pmp->pm_inusemap[idx]; map |= (1 << (cn % N_INUSEBITS)) - 1; - if (map != (u_int)-1) { - cn = idx * N_INUSEBITS + ffs(map^(u_int)-1) - 1; + if (map != FULL_RUN) { + cn = idx * N_INUSEBITS + ffs(map ^ FULL_RUN) - 1; if ((l = chainlength(pmp, cn, count)) >= count) return (chainalloc(pmp, cn, count, fillwith, retcluster, got)); if (l > foundl) { @@ -878,7 +880,7 @@ fillinusemap(struct msdosfsmount *pmp) * loop further down. */ for (cn = 0; cn < (pmp->pm_maxcluster + N_INUSEBITS) / N_INUSEBITS; cn++) - pmp->pm_inusemap[cn] = (u_int)-1; + pmp->pm_inusemap[cn] = FULL_RUN; /* * Figure how many free clusters are in the filesystem by ripping |
