From patchwork Wed Apr 16 22:29:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namjae Jeon X-Patchwork-Id: 339720 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3566F140080 for ; Thu, 17 Apr 2014 08:29:23 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756714AbaDPW3W (ORCPT ); Wed, 16 Apr 2014 18:29:22 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:33933 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750919AbaDPW3V (ORCPT ); Wed, 16 Apr 2014 18:29:21 -0400 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N45001Q7AGVXC10@mailout1.samsung.com> for linux-ext4@vger.kernel.org; Thu, 17 Apr 2014 07:29:19 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.115]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 24.6C.12635.F340F435; Thu, 17 Apr 2014 07:29:19 +0900 (KST) X-AuditID: cbfee68d-b7fcd6d00000315b-80-534f043f6eb1 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 44.1E.28157.F340F435; Thu, 17 Apr 2014 07:29:19 +0900 (KST) Received: from DONAMJAEJEO06 ([10.88.104.63]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N45005ZZAGVXK20@mmp2.samsung.com>; Thu, 17 Apr 2014 07:29:19 +0900 (KST) From: Namjae Jeon To: Theodore Ts'o Cc: linux-ext4 , =?iso-8859-2?Q?Luk=E1=B9_Czerner?= Subject: [PATCH 2/3] ext4: fix ZERO_RANGE test failure in data journalling mode Date: Thu, 17 Apr 2014 07:29:18 +0900 Message-id: <002a01cf59c3$4eaf7490$ec0e5db0$@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=iso-8859-2 Content-transfer-encoding: 7bit X-Mailer: Microsoft Outlook 14.0 Thread-index: Ac9ZwyrenFz5WLyeQ9S5t68pTDAYyA== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrFIsWRmVeSWpSXmKPExsWyRsSkWNeexT/Y4NEEY4tlDzazWMycd4fN orXnJ7sDs0fTmaPMHu/3XWXz+LxJLoA5issmJTUnsyy1SN8ugSvj5fTtzAVTOSqeX57I2sB4 g62LkZNDQsBE4uPLyawQtpjEhXvrgeJcHEICSxkldlzeyARTtOnuZBaIxHRGiVVNGxghnL+M EjdmLwFq5+BgE9CW+LNFFKRBREBR4lbLF2YQm1kgXeLfkX9g24QF/CXO7Z/IDmKzCKhKbJty ixHE5hWwlJg76zEzhC0o8WPyPRaQkcwCOhJfJ0VAjJGX2LzmLTPEPQoSO86+ZoRYpSdxa8YM NogaEYl9L96BnSYhsIxdYsLZ2SwQuwQkvk0+BDZTQkBWYtMBqDmSEgdX3GCZwCg2C8nmWQib ZyHZPAvJhgWMLKsYRVMLkguKk9KLDPWKE3OLS/PS9ZLzczcxAuPp9L9nvTsYbx+wPsSYDLR9 IrOUaHI+MB7zSuINjc2MLExNTI2NzC3NSBNWEudNepgUJCSQnliSmp2aWpBaFF9UmpNafIiR iYNTqoFx95NJThlTr5+QsjonYhOSc1zNtv8N201freSqtw9FFrVeiVhU/y4g8HxkK/u+8uUL +/pO7v8y/e6FTL87XpIRLGyfuLTvxj44xSHw5/7aHw+05sinhodZ7/6psinxVMXTXT/rW1Js l7ZuPHxdcMHN8Ke5r6b/v/521wLxh/3NEfPV+ZvmqmmWKLEUZyQaajEXFScCAI4phJW9AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpnleLIzCtJLcpLzFFi42I5/e+xoK49i3+wwYZmLYtlDzazWMycd4fN orXnJ7sDs0fTmaPMHu/3XWXz+LxJLoA5qoHRJiM1MSW1SCE1Lzk/JTMv3VbJOzjeOd7UzMBQ 19DSwlxJIS8xN9VWycUnQNctMwdok5JCWWJOKVAoILG4WEnfDtOE0BA3XQuYxghd35AguB4j AzSQsIYx4+X07cwFUzkqnl+eyNrAeIOti5GTQ0LARGLT3cksELaYxIV764HiXBxCAtMZJVY1 bWCEcP4yStyYvYS1i5GDg01AW+LPFlGQBhEBRYlbLV+YQWxmgXSJf0f+gQ0VFvCXOLd/IjuI zSKgKrFtyi1GEJtXwFJi7qzHzBC2oMSPyfdYQEYyC+hIfJ0UATFGXmLzmrfMEPcoSOw4+5oR YpWexK0ZM9ggakQk9r14xziBUWAWkkmzECbNQjJpFpKOBYwsqxhFUwuSC4qT0nON9IoTc4tL 89L1kvNzNzGCo/WZ9A7GVQ0WhxgFOBiVeHg5f/sFC7EmlhVX5h5ilOBgVhLhzTwLFOJNSays Si3Kjy8qzUktPsSYDPTnRGYp0eR8YCLJK4k3NDYxM7I0Mje0MDI2J01YSZz3YKt1oJBAemJJ anZqakFqEcwWJg5OqQZGppwPgie8dd9vP2a73XZmw+1TG90Wn1+/odz7GJ/VuR6VlKDN965N Xlud9mDS3PcvefmKl4rHdm1OW2zhfVT3wIxVMcF3g0zSEsNEZX9e9j+RemaqWv565s7/8uY5 wl+utf7LSfgYoCVnl7T/QlHngvVPJfvTooRqmw+WzHd5JS75QOeDp1qJEktxRqKhFnNRcSIA 0QMfjRoDAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Namjae Jeon xfstests generic/091 is failing when mounting ext4 with data=journal. I think that this regression is same problem that occurred prior to collapse range issue. So ZERO RANGE also need to call ext4_force_commit as collapse range. Signed-off-by: Namjae Jeon Signed-off-by: Ashish Sangwan --- fs/ext4/extents.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index f386dd6..a64242f 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4742,6 +4742,13 @@ static long ext4_zero_range(struct file *file, loff_t offset, trace_ext4_zero_range(inode, offset, len, mode); + /* Call ext4_force_commit to flush all data in case of data=journal. */ + if (ext4_should_journal_data(inode)) { + ret = ext4_force_commit(inode->i_sb); + if (ret) + return ret; + } + /* * Write out all dirty pages to avoid race conditions * Then release them.