svn commit: r187199 - head/sys/fs/msdosfs

[Edward Tomasz Napierala]

Author: trasz
Date: Tue Jan 13 22:35:26 2009
New Revision: 187199
URL: http://svn.freebsd.org/changeset/base/187199

Log:
  Turn a "panic: non-decreasing id" into an error printf.  This seems
  to be caused by a metadata corruption that occurs quite often after
  unplugging a pendrive during write activity.
  
  Reviewed by:	scottl
  Approved by:	rwatson (mentor)
  Sponsored by:	FreeBSD Foundation

Modified:
  head/sys/fs/msdosfs/msdosfs_conv.c

Modified: head/sys/fs/msdosfs/msdosfs_conv.c
==============================================================================
--- head/sys/fs/msdosfs/msdosfs_conv.c	Tue Jan 13 22:28:48 2009	(r187198)
+++ head/sys/fs/msdosfs/msdosfs_conv.c	Tue Jan 13 22:35:26 2009	(r187199)
@@ -1060,8 +1060,11 @@ mbnambuf_write(struct mbnambuf *nbp, cha
 	char *slot;
 	size_t count, newlen;
 
-	KASSERT(nbp->nb_len == 0 || id == nbp->nb_last_id - 1,
-	    ("non-decreasing id: id %d, last id %d", id, nbp->nb_last_id));
+	if (nbp->nb_len != 0 && id != nbp->nb_last_id - 1) {
+		printf("msdosfs: non-decreasing id: id %d, last id %d\n",
+		    id, nbp->nb_last_id);
+		return;
+	}
 
 	/* Will store this substring in a WIN_CHARS-aligned slot. */
 	slot = &nbp->nb_buf[id * WIN_CHARS];