 @@ -1,14 +1,14 @@
-/*	$NetBSD: msdosfs_fat.c,v 1.32 2018/01/27 03:54:01 sevan Exp $	*/
+/*	$NetBSD: msdosfs_fat.c,v 1.33 2018/07/25 22:07:59 kamil Exp $	*/
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
  * Copyright (C) 1994, 1995, 1997 TooLs GmbH.
  * All rights reserved.
  * Original code by Paul Popelka (paulp@uts.amdahl.com) (see below).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -42,27 +42,27 @@
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
+ *
  * October 1992
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_fat.c,v 1.32 2018/01/27 03:54:01 sevan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_fat.c,v 1.33 2018/07/25 22:07:59 kamil Exp $");
 /*
  * kernel include files.
  */
 #include <sys/param.h>
 #include <sys/file.h>
 #ifdef _KERNEL
 #include <sys/mount.h>		/* to define statvfs structure */
 #include <sys/errno.h>
 #include <sys/systm.h>
 #include <sys/kauth.h>
 #include <sys/dirent.h>
 #include <sys/namei.h>
 @@ -399,27 +399,27 @@ updatefats(struct msdosfsmount *pmp, str
 	int i, error;
 	struct buf *bpn;
 	DPRINTF(("%s(pmp %p, bp %p, fatbn %lu)\n", __func__, pmp, bp, fatbn));
 	/*
 	 * If we have an FSInfo block, update it.
 	 */
 	if (pmp->pm_fsinfo) {
 		u_long cn = pmp->pm_nxtfree;
 		if (pmp->pm_freeclustercount
 		    && (pmp->pm_inusemap[cn / N_INUSEBITS]
-			& (1 << (cn % N_INUSEBITS)))) {
+			& (1U << (cn % N_INUSEBITS)))) {
 			/*
 			 * The cluster indicated in FSInfo isn't free
 			 * any longer.  Got get a new free one.
 			 */
 			for (cn = 0; cn < pmp->pm_maxcluster; cn++)
 				if (pmp->pm_inusemap[cn / N_INUSEBITS] != (u_int)-1)
 					break;
 			pmp->pm_nxtfree = cn
 				+ ffs(pmp->pm_inusemap[cn / N_INUSEBITS]
 				      ^ (u_int)-1) - 1;
+		}
 		/*
 		 * XXX  If the fsinfo block is stored on media with
 @@ -499,36 +499,36 @@ updatefats(struct msdosfsmount *pmp, str
+ *
  *	+----+----+----+   +----+----+----+
  *	|  3    0    1 |   |  4    5    2 |
  *	+----+----+----+   +----+----+----+
  *	cluster n  	   cluster n+1
+ *
  * Where n is even. m = n + (n >> 2)
+ *
  */
 static inline void
 usemap_alloc(struct msdosfsmount *pmp, u_long cn)
+{
-	pmp->pm_inusemap[cn / N_INUSEBITS] |= 1 << (cn % N_INUSEBITS);
+	pmp->pm_inusemap[cn / N_INUSEBITS] |= 1U << (cn % N_INUSEBITS);
 	pmp->pm_freeclustercount--;
+}
 static inline void
 usemap_free(struct msdosfsmount *pmp, u_long cn)
+{
 	pmp->pm_freeclustercount++;
-	pmp->pm_inusemap[cn / N_INUSEBITS] &= ~(1 << (cn % N_INUSEBITS));
+	pmp->pm_inusemap[cn / N_INUSEBITS] &= ~(1U << (cn % N_INUSEBITS));
+}
 int
 clusterfree(struct msdosfsmount *pmp, u_long cluster, u_long *oldcnp)
+{
 	int error;
 	u_long oldcn;
 	usemap_free(pmp, cluster);
 	error = fatentry(FAT_GET_AND_SET, pmp, cluster, &oldcn, MSDOSFSFREE);
 	if (error) {
 		usemap_alloc(pmp, cluster);
 		return (error);
 @@ -731,27 +731,27 @@ fatchain(struct msdosfsmount *pmp, u_lon
  * count - maximum interesting length
  */
 int
 chainlength(struct msdosfsmount *pmp, u_long start, u_long count)
+{
 	u_long idx, max_idx;
 	u_int map;
 	u_long len;
 	max_idx = pmp->pm_maxcluster / N_INUSEBITS;
 	idx = start / N_INUSEBITS;
 	start %= N_INUSEBITS;
 	map = pmp->pm_inusemap[idx];
-	map &= ~((1 << start) - 1);
+	map &= ~((1U << start) - 1);
 	if (map) {
 		len = ffs(map) - 1 - start;
 		return (len > count ? count : len);
+	}
 	len = N_INUSEBITS - start;
 	if (len >= count)
 		return (count);
 	while (++idx <= max_idx) {
 		if (len >= count)
 			break;
 		if ((map = pmp->pm_inusemap[idx]) != 0) {
 			len +=  ffs(map) - 1;
 			break;
 @@ -827,44 +827,44 @@ clusteralloc(struct msdosfsmount *pmp, u
 		len = 0;
+	}
 	/*
 	 * Start at a (pseudo) random place to maximize cluster runs
 	 * under multiple writers.
 	 */
 	newst = (start * 1103515245 + 12345) % (pmp->pm_maxcluster + 1);
 	foundl = 0;
 	for (cn = newst; cn <= pmp->pm_maxcluster;) {
 		idx = cn / N_INUSEBITS;
 		map = pmp->pm_inusemap[idx];
-		map |= (1 << (cn % N_INUSEBITS)) - 1;
+		map |= (1U << (cn % N_INUSEBITS)) - 1;
 		if (map != (u_int)-1) {
 			cn = idx * N_INUSEBITS + ffs(map^(u_int)-1) - 1;
 			if ((l = chainlength(pmp, cn, count)) >= count)
 				return (chainalloc(pmp, cn, count, fillwith, retcluster, got));
 			if (l > foundl) {
 				foundcn = cn;
 				foundl = l;
+			}
 			cn += l + 1;
 			continue;
+		}
 		cn += N_INUSEBITS - cn % N_INUSEBITS;
+	}
 	for (cn = 0; cn < newst;) {
 		idx = cn / N_INUSEBITS;
 		map = pmp->pm_inusemap[idx];
-		map |= (1 << (cn % N_INUSEBITS)) - 1;
+		map |= (1U << (cn % N_INUSEBITS)) - 1;
 		if (map != (u_int)-1) {
 			cn = idx * N_INUSEBITS + ffs(map^(u_int)-1) - 1;
 			if ((l = chainlength(pmp, cn, count)) >= count)
 				return (chainalloc(pmp, cn, count, fillwith, retcluster, got));
 			if (l > foundl) {
 				foundcn = cn;
 				foundl = l;
+			}
 			cn += l + 1;
 			continue;
+		}
 		cn += N_INUSEBITS - cn % N_INUSEBITS;
+	}