From patchwork Mon Jan 8 01:36:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changwei Ge X-Patchwork-Id: 10148545 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0CFD360210 for ; Mon, 8 Jan 2018 01:38:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F316728732 for ; Mon, 8 Jan 2018 01:38:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E6C6D2887B; Mon, 8 Jan 2018 01:38:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from aserp2120.oracle.com (aserp2120.oracle.com [141.146.126.78]) (using TLSv1.2 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5625128732 for ; Mon, 8 Jan 2018 01:38:49 +0000 (UTC) Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.22/8.16.0.21) with SMTP id w081afvq008273; Mon, 8 Jan 2018 01:38:08 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : date : message-id : mime-version : cc : subject : list-id : list-unsubscribe : list-archive : list-post : list-help : list-subscribe : content-type : content-transfer-encoding : sender; s=corp-2017-10-26; bh=mI1hyvH3Jjvp03fgVMds5iCct6M7c1azEls+lof+DPM=; b=H5dADHddsF3SdNVZ1VXkdxymimTHoCY+/b8WwsAz9PlRJZLtrBXVRnPtx/ODNt5xfHUz bUWMC+BCg6wa2Rk2yVUxlYo5BVk2yFY49IgSXGCKoNhtLiXfy9Z2bBLVmio13i30rLya X1VACZfE5rteSzYvMBG9x3OCjZPlDwoabb7UBYX6DMJG3EQMcE5QIw17v3zsznO8pFW1 Ogmcz2y7/PVI4RtZ8biobUzbtHVrhjNHXQ+Vm9WVsfQGm6U7aIEuF8pBdGTV7UK3/xd2 WC4bck9httbdRVM5SOqlozb6irwdxGfFByTtWQndYtOqzwhaRpD547kUgvnQ5C65evRC TA== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp2120.oracle.com with ESMTP id 2fbvm8076w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 08 Jan 2018 01:38:08 +0000 Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w081c5gl010323 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 8 Jan 2018 01:38:06 GMT Received: from localhost ([127.0.0.1] helo=lb-oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1eYMO5-00055D-Pe; Sun, 07 Jan 2018 17:38:05 -0800 Received: from userv0021.oracle.com ([156.151.31.71]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1eYMO3-000550-1x for ocfs2-devel@oss.oracle.com; Sun, 07 Jan 2018 17:38:03 -0800 Received: from userp2040.oracle.com (userp2040.oracle.com [156.151.31.90]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w081c2d5011576 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=FAIL) for ; Mon, 8 Jan 2018 01:38:02 GMT Received: from pps.filterd (userp2040.oracle.com [127.0.0.1]) by userp2040.oracle.com (8.16.0.22/8.16.0.21) with SMTP id w081bfGh010622 for ; Mon, 8 Jan 2018 01:38:02 GMT Received: from h3cmg01-ex.h3c.com (smtp.h3c.com [60.191.123.56]) by userp2040.oracle.com with ESMTP id 2fbp2c5s9f-1 for ; Mon, 08 Jan 2018 01:38:01 +0000 Received: from BJHUB01-EX.srv.huawei-3com.com (unknown [10.63.20.169]) by h3cmg01-ex.h3c.com with smtp id 6768_7618_14393708_3b65_49f2_9266_1a4f668d16ce; Mon, 08 Jan 2018 09:36:21 +0800 Received: from H3CMLB12-EX.srv.huawei-3com.com ([fe80::10fe:abde:731b:fdde]) by BJHUB01-EX.srv.huawei-3com.com ([::1]) with mapi id 14.03.0248.002; Mon, 8 Jan 2018 09:36:07 +0800 From: Changwei Ge To: Junxiao Bi , Joseph Qi , "Mark Fasheh" , Joel Becker Thread-Topic: [PATCH 1/2] ocfs2: make metadata estimation accurate and clear Thread-Index: AdOIIQzE69O3s3/nQEKtJSK5ThFh4g== Date: Mon, 8 Jan 2018 01:36:05 +0000 Message-ID: <63ADC13FD55D6546B7DECE290D39E373F290CEEE@H3CMLB12-EX.srv.huawei-3com.com> Accept-Language: en-US, zh-CN Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.125.136.231] MIME-Version: 1.0 X-CLX-Shades: MLX X-CLX-Response: 1TFkXGxIaEQpMehcaEQpZTRdnZnIRCllJFxpxGhAadwYbHBpxGRMQGncGGBo GGhEKWV4XaG55EQpJRhdFWEtJRk91WlhFTl9JXkNFRBl1T0sRCkNOF05Ab3pYb2sdS35SE3wTUG AcHhxIfnJ5QkwaQ2JzRxIcEQpYXBcfBBoEGxgYBxxLSEtPHhwaBRsaBBsaGgQeEgQfEBseGh8aE QpeWRd4Q2JrfBEKTVwXGxIdEQpMWhdoaUJNXREKTU4XaBEKTEYXY2sRCkNaFxwaBBsTGwQbGBkE HxwRCkJeFxsRCkReFx4RCkRJFxkRCkJGF2VBRBxNTkMYEnxCEQpCXBcaEQpCRRduGVhMXmEBcFJ MYREKQk4XZEJ8WkVEQWIdZFARCkJMF29+XU0YBV1mGlJ7EQpCbBdkYU9LYEJIEngdZxEKQkAXY1 9kZVpCRFNFeVwRCkJYF2J9b3kBTxgZcHB7EQpNXhcbEQpwZxdtAWRaH15LcH1nfhAaEQpwaBdtR WBeQF1eGktIXBAaEQpwaBdnXEh5RHwTXE0fcxAaEQpwaBdjHEllWX9cHF5/GxAaEQpwaBdrfWgc b2AbT0NuYRAaEQpwaBdlYWhnfmwaenN+BRAaEQpwbBdtThtvUwFHUkgdcxAZGhEKbX4XGxEKWE0 XSxEg X-PDR: PASS X-Source-IP: 60.191.123.56 X-ServerName: smtp.h3c.com X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 ip4:60.191.123.56 ip4:60.191.123.50 ip4:221.12.31.13 ip4:221.12.31.56 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8767 signatures=668652 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=0 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=180 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=854 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1801080019 X-Spam: Clean Cc: "ocfs2-devel@oss.oracle.com" Subject: [Ocfs2-devel] [PATCH 1/2] ocfs2: make metadata estimation accurate and clear X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ocfs2-devel-bounces@oss.oracle.com Errors-To: ocfs2-devel-bounces@oss.oracle.com X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8767 signatures=668652 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1801080019 X-Virus-Scanned: ClamAV using ClamSMTP Current code assume that ::w_unwritten_list always has only one item on. This is not right and hard to get understood. So improve how to count unwritten item. Reported-by: John Lightsey Signed-off-by: Changwei Ge --- fs/ocfs2/aops.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index d151632..256986a 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -797,6 +797,7 @@ struct ocfs2_write_ctxt { struct ocfs2_cached_dealloc_ctxt w_dealloc; struct list_head w_unwritten_list; + unsigned int w_unwritten_count; }; void ocfs2_unlock_and_free_pages(struct page **pages, int num_pages) @@ -1386,6 +1387,7 @@ static int ocfs2_unwritten_check(struct inode *inode, desc->c_clear_unwritten = 0; list_add_tail(&new->ue_ip_node, &oi->ip_unwritten_list); list_add_tail(&new->ue_node, &wc->w_unwritten_list); + wc->w_unwritten_count++; new = NULL; unlock: spin_unlock(&oi->ip_lock); @@ -2256,7 +2258,7 @@ static int ocfs2_dio_wr_get_block(struct inode *inode, sector_t iblock, ue->ue_phys = desc->c_phys; list_splice_tail_init(&wc->w_unwritten_list, &dwc->dw_zero_list); - dwc->dw_zero_count++; + dwc->dw_zero_count += wc->w_unwritten_count; } ret = ocfs2_write_end_nolock(inode->i_mapping, pos, len, len, wc);