svn commit: r321040 - head/sys/ufs/ffs

[Konstantin Belousov]

Author: kib
Date: Sun Jul 16 07:11:29 2017
New Revision: 321040
URL: https://svnweb.freebsd.org/changeset/base/321040

Log:
  A followup to r320453, correct removal of the blocks from UFS snapshots.
  
  Tested by:	pho
  PR:    220693
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/ufs/ffs/ffs_alloc.c

Modified: head/sys/ufs/ffs/ffs_alloc.c
==============================================================================
--- head/sys/ufs/ffs/ffs_alloc.c	Sun Jul 16 00:25:00 2017	(r321039)
+++ head/sys/ufs/ffs/ffs_alloc.c	Sun Jul 16 07:11:29 2017	(r321040)
@@ -2603,7 +2603,8 @@ ffs_getcg(fs, devvp, cg, bpp, cgpp)
 
 	*bpp = NULL;
 	*cgpp = NULL;
-	error = bread(devvp, fsbtodb(fs, cgtod(fs, cg)),
+	error = bread(devvp, devvp->v_type == VREG ?
+	    fragstoblks(fs, cgtod(fs, cg)) : fsbtodb(fs, cgtod(fs, cg)),
 	    (int)fs->fs_cgsize, NOCRED, &bp);
 	if (error != 0)
 		return (error);