Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp4719466ybv; Wed, 26 Feb 2020 01:57:57 -0800 (PST) X-Google-Smtp-Source: APXvYqzgQmN9LcJuXtFaFZ/uLu+jwQgGQp9jeuRD0QYwpvZGzXSyzjuUfqoayM7Yk4DXM9MYAUxx X-Received: by 2002:a9d:7f81:: with SMTP id t1mr2128934otp.95.1582711077332; Wed, 26 Feb 2020 01:57:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582711077; cv=none; d=google.com; s=arc-20160816; b=wpGcbF/HbX4aidYG84IuYQ35A5eq706wn5g4BgcGnnAqM5aqeuGTptKoKx7BXzEZCE bzqkVm4VqaHEd+bPiWKlKeUtwG3A0GPv2kbQ+lr+0Mv/qRrPty4zyZ6vmxTzFwgdxSpH 6jQqGHIwurVBPjA60+ya2dVuwBbGlxogwImWxnREbMHPQQLSxOLHIRzCP1TCmGU9gvEo d7rQE5l65VvCxE7nb5ROgx1g+XL06ESCUz6508zlttt+WUnGv/OXRj7k5az1KOt2Jg7u SPLTgcnSNIGzZayjoNQIqCtSE3DJu8A60ZK/u97kGsP7lo5k1OkPbaGUVtKY/j4jccRr rqrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:content-transfer-encoding :mime-version:references:in-reply-to:date:subject:cc:to:from; bh=IiIbaSXv1LqrjMvOkJggw9WBP+IebqmNxAxV+TPNEVk=; b=WWfMm1IIQpt3sZTYBLtiKa+Sv800F0r+YIGBjaZ4KyecBBMWR+qz+fC7pdY4Kl0gj6 yQqcuBMsvNY4TGPOzXEiUFsiYHS7uf0CBvcbEVDccL91EWPiAS+QkwpJ1XPFjA08zs1i wYAv63AdDzJ+GqvX4nXD4OUSr7FP8MSBN7YRwjp+MeeWW3pL3HAsHJZS0DOxdtWKhTPG kLC/n0Qsz+omSWUfMHcruRLdgxD+rjb22oPBDYifN3IqN2qbecpcsaLzyfQYJirem+Rd xlN9OPCHDSky9EJ70MWbGS1Dpv2IBTC4oyG89/lNDyMXxWhFK6A7mI0IStcUTeqtP4Tg HemQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l23si896928otj.302.2020.02.26.01.57.46; Wed, 26 Feb 2020 01:57:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727891AbgBZJ5h (ORCPT + 99 others); Wed, 26 Feb 2020 04:57:37 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:33388 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727711AbgBZJ5c (ORCPT ); Wed, 26 Feb 2020 04:57:32 -0500 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 01Q9qUkq024111 for ; Wed, 26 Feb 2020 04:57:30 -0500 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0b-001b2d01.pphosted.com with ESMTP id 2ydcnegnx4-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 26 Feb 2020 04:57:30 -0500 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 26 Feb 2020 09:57:28 -0000 Received: from b06avi18878370.portsmouth.uk.ibm.com (9.149.26.194) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 26 Feb 2020 09:57:25 -0000 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06avi18878370.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 01Q9vO3A32440664 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 26 Feb 2020 09:57:24 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 76D5A42045; Wed, 26 Feb 2020 09:57:22 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 84BD642042; Wed, 26 Feb 2020 09:57:20 +0000 (GMT) Received: from localhost.localdomain.com (unknown [9.199.47.18]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 26 Feb 2020 09:57:20 +0000 (GMT) From: Ritesh Harjani To: jack@suse.cz, tytso@mit.edu, linux-ext4@vger.kernel.org Cc: adilger.kernel@dilger.ca, linux-fsdevel@vger.kernel.org, darrick.wong@oracle.com, hch@infradead.org, cmaiolino@redhat.com, Ritesh Harjani Subject: [PATCHv3 1/6] ext4: Add IOMAP_F_MERGED for non-extent based mapping Date: Wed, 26 Feb 2020 15:27:03 +0530 X-Mailer: git-send-email 2.21.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 x-cbid: 20022609-0020-0000-0000-000003ADB3C4 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20022609-0021-0000-0000-00002205CDE7 Message-Id: <25695b1a4bc3b5c3a2f513ecb612195aa7154975.1582702693.git.riteshh@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.572 definitions=2020-02-26_02:2020-02-25,2020-02-26 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 priorityscore=1501 spamscore=0 mlxscore=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 suspectscore=0 adultscore=0 mlxlogscore=982 malwarescore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2002260074 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org IOMAP_F_MERGED needs to be set in case of non-extent based mapping. This is needed in later patches for conversion of ext4_fiemap to use iomap. Signed-off-by: Ritesh Harjani --- fs/ext4/inode.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index d035acab5b2a..3b4230cf0bc2 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3335,6 +3335,10 @@ static void ext4_set_iomap(struct inode *inode, struct iomap *iomap, iomap->offset = (u64) map->m_lblk << blkbits; iomap->length = (u64) map->m_len << blkbits; + if ((map->m_flags & (EXT4_MAP_UNWRITTEN | EXT4_MAP_MAPPED)) && + !ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) + iomap->flags |= IOMAP_F_MERGED; + /* * Flags passed to ext4_map_blocks() for direct I/O writes can result * in m_flags having both EXT4_MAP_MAPPED and EXT4_MAP_UNWRITTEN bits -- 2.21.0