svn commit: r234480 - projects/nand/sys/kern

[Grzegorz Bernacki]

Author: gber
Date: Fri Apr 20 03:12:02 2012
New Revision: 234480
URL: http://svn.freebsd.org/changeset/base/234480

Log:
  nandfs: Revert changes in sys/kern files.
  
  Those workarounds are not needed anymore.
  
  Obtained from: Semihalf
  Supported by:  FreeBSD Foundation, Juniper Networks

Modified:
  projects/nand/sys/kern/vfs_subr.c
  projects/nand/sys/kern/vfs_vnops.c

Modified: projects/nand/sys/kern/vfs_subr.c
==============================================================================
--- projects/nand/sys/kern/vfs_subr.c	Fri Apr 20 03:02:07 2012	(r234479)
+++ projects/nand/sys/kern/vfs_subr.c	Fri Apr 20 03:12:02 2012	(r234480)
@@ -1974,8 +1974,7 @@ reassignbuf(struct buf *bp)
 	 * of clean buffers.
 	 */
 	if (bp->b_flags & B_DELWRI) {
-		if (!(bp->b_flags & B_MANAGED) &&
-		    (bo->bo_flag & BO_ONWORKLST) == 0) {
+		if ((bo->bo_flag & BO_ONWORKLST) == 0) {
 			switch (vp->v_type) {
 			case VDIR:
 				delay = dirdelay;
@@ -1991,15 +1990,13 @@ reassignbuf(struct buf *bp)
 		buf_vlist_add(bp, bo, BX_VNDIRTY);
 	} else {
 		buf_vlist_add(bp, bo, BX_VNCLEAN);
-		if (!(bp->b_flags & B_MANAGED)) {
-			if ((bo->bo_flag & BO_ONWORKLST) &&
-			    bo->bo_dirty.bv_cnt == 0) {
-				mtx_lock(&sync_mtx);
-				LIST_REMOVE(bo, bo_synclist);
-				syncer_worklist_len--;
-				mtx_unlock(&sync_mtx);
-				bo->bo_flag &= ~BO_ONWORKLST;
-			}
+
+		if ((bo->bo_flag & BO_ONWORKLST) && bo->bo_dirty.bv_cnt == 0) {
+			mtx_lock(&sync_mtx);
+			LIST_REMOVE(bo, bo_synclist);
+			syncer_worklist_len--;
+			mtx_unlock(&sync_mtx);
+			bo->bo_flag &= ~BO_ONWORKLST;
 		}
 	}
 #ifdef INVARIANTS

Modified: projects/nand/sys/kern/vfs_vnops.c
==============================================================================
--- projects/nand/sys/kern/vfs_vnops.c	Fri Apr 20 03:02:07 2012	(r234479)
+++ projects/nand/sys/kern/vfs_vnops.c	Fri Apr 20 03:12:02 2012	(r234480)
@@ -1055,8 +1055,6 @@ vn_start_write(vp, mpp, flags)
 				error = EWOULDBLOCK;
 				goto unlock;
 			}
-			if (strcmp(mp->mnt_stat.f_fstypename, "nandfs") == 0)
-				flags &= ~PCATCH;
 			error = msleep(&mp->mnt_flag, MNT_MTX(mp),
 			    (PUSER - 1) | (flags & PCATCH), "suspfs", 0);
 			if (error)