From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937080AbdAFUzJ (ORCPT ); Fri, 6 Jan 2017 15:55:09 -0500 Received: from mailrelay112.isp.belgacom.be ([195.238.20.139]:7405 "EHLO mailrelay112.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161747AbdAFUyZ (ORCPT ); Fri, 6 Jan 2017 15:54:25 -0500 X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2CtAgADA3BY/2ZisVteHAEBBAEBCgEBg?= =?us-ascii?q?zkBAQEBAR9AgSuNV3KRVgGQLYJDgg+CCYYiAoFVQBQBAgEBAQEBAQFjKIRpBic?= =?us-ascii?q?vIxAZJhI5HgYTiGMRsjQ6ih8BAQgohkWPDQWIcpIjkUcCgXWOZEiHQYpIHziBI?= =?us-ascii?q?RgYhF4cgWA9NYhmAQEB?= X-IPAS-Result: =?us-ascii?q?A2CtAgADA3BY/2ZisVteHAEBBAEBCgEBgzkBAQEBAR9AgSu?= =?us-ascii?q?NV3KRVgGQLYJDgg+CCYYiAoFVQBQBAgEBAQEBAQFjKIRpBicvIxAZJhI5HgYTi?= =?us-ascii?q?GMRsjQ6ih8BAQgohkWPDQWIcpIjkUcCgXWOZEiHQYpIHziBIRgYhF4cgWA9NYh?= =?us-ascii?q?mAQEB?= From: Fabian Frederick To: Jan Kara Cc: fabf@skynet.be, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 08/12 linux-next] udf: remove next_epos from udf_update_extent_cache() Date: Fri, 6 Jan 2017 21:53:56 +0100 Message-Id: <1483736037-25111-9-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1483736037-25111-1-git-send-email-fabf@skynet.be> References: <1483736037-25111-1-git-send-email-fabf@skynet.be> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org udf_update_extent_cache() is only called from inode_bmap() with 1 for next_epos Signed-off-by: Fabian Frederick --- fs/udf/inode.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 66514ad..2327f72 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -109,7 +109,7 @@ static int udf_read_extent_cache(struct inode *inode, loff_t bcount, /* Add extent to extent cache */ static void udf_update_extent_cache(struct inode *inode, loff_t estart, - struct extent_position *pos, int next_epos) + struct extent_position *pos) { struct udf_inode_info *iinfo = UDF_I(inode); @@ -121,16 +121,15 @@ static void udf_update_extent_cache(struct inode *inode, loff_t estart, memcpy(&iinfo->cached_extent.epos, pos, sizeof(struct extent_position)); iinfo->cached_extent.lstart = estart; - if (next_epos) - switch (iinfo->i_alloc_type) { - case ICBTAG_FLAG_AD_SHORT: - iinfo->cached_extent.epos.offset -= - sizeof(struct short_ad); - break; - case ICBTAG_FLAG_AD_LONG: - iinfo->cached_extent.epos.offset -= - sizeof(struct long_ad); - } + switch (iinfo->i_alloc_type) { + case ICBTAG_FLAG_AD_SHORT: + iinfo->cached_extent.epos.offset -= + sizeof(struct short_ad); + break; + case ICBTAG_FLAG_AD_LONG: + iinfo->cached_extent.epos.offset -= + sizeof(struct long_ad); + } spin_unlock(&iinfo->i_extent_cache_lock); } @@ -2286,7 +2285,7 @@ int8_t inode_bmap(struct inode *inode, sector_t block, lbcount += *elen; } while (lbcount <= bcount); /* update extent cache */ - udf_update_extent_cache(inode, lbcount - *elen, pos, 1); + udf_update_extent_cache(inode, lbcount - *elen, pos); *offset = (bcount + *elen - lbcount) >> blocksize_bits; return etype; -- 2.7.4