From owner-p4-projects@FreeBSD.ORG Mon May 17 10:43:24 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF7F61065674; Mon, 17 May 2010 10:43:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B9741065673 for ; Mon, 17 May 2010 10:43:24 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 499118FC12 for ; Mon, 17 May 2010 10:43:24 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4HAhNAQ000230 for ; Mon, 17 May 2010 10:43:23 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4HAhNEQ000228 for perforce@freebsd.org; Mon, 17 May 2010 10:43:23 GMT (envelope-from lz@FreeBSD.org) Date: Mon, 17 May 2010 10:43:23 GMT Message-Id: <201005171043.o4HAhNEQ000228@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178385 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 10:43:24 -0000 http://p4web.freebsd.org/@@178385?ac=10 Change 178385 by lz@gnehzuil-freebsd on 2010/05/17 10:43:11 Add two macros to operate tree lock. Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#12 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_rsv_win.h#7 edit Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#12 (text+ko) ==== @@ -247,11 +247,13 @@ bbp = (char *)bp->b_data; size = rp->rw_goal_size; - mtx_lock_spin(&fs->e2fs_rsv_lock); + /*mtx_lock_spin(&fs->e2fs_rsv_lock);*/ + EXT2_TREE_LOCK(fs); /* If tree is empty, then try to alloc according to bpref */ if (RB_EMPTY(&fs->e2fs_rsv_tree)) { - mtx_unlock_spin(&fs->e2fs_rsv_lock); + /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/ + EXT2_TREE_UNLOCK(fs); /* bpref is not in this cylinder group. * So try to allocate it in other group. */ @@ -295,7 +297,8 @@ if (ret < 0) { if (rp->rw_end != EXT2_RWI_NOT_ALLOCATED) ext2_remove_rsv_win(fs, rp); - mtx_unlock_spin(&fs->e2fs_rsv_lock); + /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/ + EXT2_TREE_UNLOCK(fs); EXT2_LOCK(ump); if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) @@ -305,7 +308,8 @@ return 0; goto allocated1; } - mtx_unlock_spin(&fs->e2fs_rsv_lock); + /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/ + EXT2_TREE_UNLOCK(fs); if (isclr(bbp, bpref) && bpref >= rp->rw_start && @@ -324,9 +328,11 @@ } if (loc == end) { - mtx_lock_spin(&fs->e2fs_rsv_lock); + /*mtx_lock_spin(&fs->e2fs_rsv_lock);*/ + EXT2_TREE_LOCK(fs); ext2_remove_rsv_win(fs, rp); - mtx_unlock_spin(&fs->e2fs_rsv_lock); + /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/ + EXT2_TREE_UNLOCK(fs); EXT2_LOCK(ump); if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) @@ -342,9 +348,11 @@ rp->rw_start = bpref + cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock; rp->rw_end = rp->rw_start + size - 1; rp->rw_alloc_hit = 0; - mtx_lock_spin(&fs->e2fs_rsv_lock); + /*mtx_lock_spin(&fs->e2fs_rsv_lock);*/ + EXT2_TREE_LOCK(fs); ext2_add_rsv_win(fs, rp); - mtx_unlock_spin(&fs->e2fs_rsv_lock); + /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/ + EXT2_TREE_UNLOCK(fs); allocated: rp->rw_alloc_hit = bpref - rp->rw_start + 1; @@ -383,9 +391,11 @@ goto gotit; } - mtx_lock_spin(&fs->e2fs_rsv_lock); + /*mtx_lock_spin(&fs->e2fs_rsv_lock);*/ + EXT2_TREE_LOCK(fs); ext2_remove_rsv_win(fs, rp); - mtx_unlock_spin(&fs->e2fs_rsv_lock); + /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/ + EXT2_TREE_UNLOCK(fs); EXT2_LOCK(ump); if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_rsv_win.h#7 (text+ko) ==== @@ -38,6 +38,9 @@ #define EXT2_IRSV_LOCK(ip) mtx_lock(&ip->i_rsv_lock) #define EXT2_IRSV_UNLOCK(ip) mtx_unlock(&ip->i_rsv_lock) +#define EXT2_TREE_LOCK(fs) mtx_lock_spin(&fs->e2fs_rsv_lock); +#define EXT2_TREE_UNLOCK(fs) mtx_unlock_spin(&fs->e2fs_rsv_lock); + /* * Reservation window entry */