From owner-p4-projects@FreeBSD.ORG Sun May 23 10:59:15 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEE471065673; Sun, 23 May 2010 10:59:14 +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 937A3106566C for ; Sun, 23 May 2010 10:59:14 +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 795108FC0A for ; Sun, 23 May 2010 10:59:14 +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 o4NAxEKv017988 for ; Sun, 23 May 2010 10:59:14 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4NAxEPI017986 for perforce@freebsd.org; Sun, 23 May 2010 10:59:14 GMT (envelope-from lz@FreeBSD.org) Date: Sun, 23 May 2010 10:59:14 GMT Message-Id: <201005231059.o4NAxEPI017986@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 178650 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: Sun, 23 May 2010 10:59:15 -0000 http://p4web.freebsd.org/@@178650?ac=10 Change 178650 by lz@gnehzuil-freebsd on 2010/05/23 10:59:02 Clean some code. Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#14 edit Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#14 (text+ko) ==== @@ -293,7 +293,7 @@ ret = ext2_find_next_rsv_win(search_rsv, rp, fs, bpref, cg); if (ret < 0) { - if (rp != NULL && rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) + if (rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) ext2_remove_rsv_win(fs, rp); EXT2_TREE_UNLOCK(fs); @@ -331,7 +331,7 @@ if (loc == end) { EXT2_TREE_LOCK(fs); - if (rp != NULL && rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) + if (rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) ext2_remove_rsv_win(fs, rp); EXT2_TREE_UNLOCK(fs); @@ -379,7 +379,7 @@ ump = ip->i_ump; bbp = (char *)bp->b_data; - if (rp != NULL && rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) { + if (rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) { start = dtogd(fs, rp->rsv_start + rp->rsv_alloc_hit); } else goto find; @@ -390,22 +390,21 @@ start = dtogd(fs, start); if (isclr(bbp, start)) { bno = start; + rp->rsv_alloc_hit++; goto gotit; } find: EXT2_TREE_LOCK(fs); - if (rp != NULL && rp->rsv_end != EXT2_RSV_NOT_ALLOCATED); + if (rp->rsv_end != EXT2_RSV_NOT_ALLOCATED); ext2_remove_rsv_win(fs, rp); EXT2_TREE_UNLOCK(fs); bno = ext2_mapsearch(fs, bbp, bpref); if (bno < 0) return 0; - goto allocated; + gotit: - rp->rsv_alloc_hit++; -allocated: setbit(bbp, (daddr_t)bno); EXT2_LOCK(ump); fs->e2fs->e2fs_fbcount--; @@ -427,8 +426,8 @@ rp = ip->i_rsv; - if (ip->i_rsv == NULL) - return ext2_alloc_blk(fs, ip, cg, bp, bpref, rp); + /*if (ip->i_rsv == NULL)*/ + /*return ext2_alloc_blk(fs, ip, cg, bp, bpref, rp);*/ /* If window is empty or bpref is not in reservation window, * we will try to allocate a new reservation window. @@ -1411,9 +1410,11 @@ start = 0; loc = skpc(0xff, len, &bbp[start]); if (loc == 0) { - printf("start = %d, len = %d, fs = %s\n", - start, len, fs->e2fs_fsmnt); - panic("ext2fs_alloccg: map corrupted"); + /* XXX: just for reservation window */ + return -1; + /*printf("start = %d, len = %d, fs = %s\n",*/ + /*start, len, fs->e2fs_fsmnt);*/ + /*panic("ext2fs_alloccg: map corrupted");*/ /* NOTREACHED */ } }