svn commit: r225850 - stable/9/sys/ufs/ffs

[Kirk McKusick]

Author: mckusick
Date: Wed Sep 28 19:36:21 2011
New Revision: 225850
URL: http://svn.freebsd.org/changeset/base/225850

Log:
  MFC: r225806:
  This update eliminates the system hang reported in kern/160662 when
  taking a snapshot on a filesystem running with journaled soft updates.
  
  As journaled soft updates first appeared in 9.0, this will be the
  only MFC of this change.
  
  Approved by:     re (kib)
  Reported by:     Hans Ottevanger
  Fix verified by: Hans Ottevanger
  PR:              kern/160662

Modified:
  stable/9/sys/ufs/ffs/ffs_snapshot.c

Modified: stable/9/sys/ufs/ffs/ffs_snapshot.c
==============================================================================
--- stable/9/sys/ufs/ffs/ffs_snapshot.c	Wed Sep 28 19:01:15 2011	(r225849)
+++ stable/9/sys/ufs/ffs/ffs_snapshot.c	Wed Sep 28 19:36:21 2011	(r225850)
@@ -203,7 +203,7 @@ ffs_snapshot(mp, snapfile)
 	ufs2_daddr_t numblks, blkno, *blkp, *snapblklist;
 	int error, cg, snaploc;
 	int i, size, len, loc;
-	int flag;
+	uint64_t flag;
 	struct timespec starttime = {0, 0}, endtime;
 	char saved_nice = 0;
 	long redo = 0, snaplistsize = 0;