From patchwork Fri May 24 14:36:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashish Sangwan X-Patchwork-Id: 246177 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 D7C622C01FC for ; Sat, 25 May 2013 00:37:28 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751845Ab3EXOh2 (ORCPT ); Fri, 24 May 2013 10:37:28 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:58100 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751441Ab3EXOh1 (ORCPT ); Fri, 24 May 2013 10:37:27 -0400 Received: by mail-pa0-f44.google.com with SMTP id wp1so1770299pac.17 for ; Fri, 24 May 2013 07:37:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=+ogObwrQi6KoL2yvM6d59anf9UpS2Ifcqel9KMDmwUo=; b=xf2srff2+tf46FedH6tKUU33YKsCYxxjLXEueDYl3sf2QDQXw4OFqSbbyq0FdvTX43 Lhr82V/2VAEmR8DPynOf09zlMXR0GABg8kB8s6VBX8BPXsvmvcscRpOcRfTJtzRNbrNo gitLTzBU0kPAmcHGtdLe2kO3c++gZc1Piwml4TNnr8Ais6Q//LJfu48uMP88vWlo5PJq iob9zbZbLsBHFq6bJWDG4SKZZ0yK3GOwf3DEI2NmkzykhyJj/tKKlE+ANrCwMvvGhAyo NWGVyRnpNfXc6XPMFjEd1p6b22ajNv+URLbvhJaWD06xHIFzTdh1A+KEpzHsV/EVHmrZ uWvA== X-Received: by 10.66.122.163 with SMTP id lt3mr18574244pab.219.1369406247104; Fri, 24 May 2013 07:37:27 -0700 (PDT) Received: from localhost.localdomain ([117.55.243.86]) by mx.google.com with ESMTPSA id cq1sm16447615pbc.13.2013.05.24.07.37.23 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 24 May 2013 07:37:26 -0700 (PDT) From: ashishsangwan2@gmail.com To: tytso@mit.edu, adilger@dilger.ca Cc: linux-ext4@vger.kernel.org, Ashish Sangwan , Namjae Jeon Subject: [PATCH] ext4: pass inode pointer instead of file poiner to punch hole Date: Fri, 24 May 2013 20:06:55 +0530 Message-Id: <519f7b26.81b1440a.6cc8.ffffa881@mx.google.com> X-Mailer: git-send-email 1.7.11.4 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Ashish Sangwan No need to pass file pointer when we can directly pass inode pointer. Signed-off-by: Ashish Sangwan Signed-off-by: Namjae Jeon --- fs/ext4/ext4.h | 2 +- fs/ext4/extents.c | 2 +- fs/ext4/inode.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 5aae3d1..04e4d1e 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2088,7 +2088,7 @@ extern int ext4_change_inode_journal_flag(struct inode *, int); extern int ext4_get_inode_loc(struct inode *, struct ext4_iloc *); extern int ext4_can_truncate(struct inode *inode); extern void ext4_truncate(struct inode *); -extern int ext4_punch_hole(struct file *file, loff_t offset, loff_t length); +extern int ext4_punch_hole(struct inode *inode, loff_t offset, loff_t length); extern int ext4_truncate_restart_trans(handle_t *, struct inode *, int nblocks); extern void ext4_set_inode_flags(struct inode *); extern void ext4_get_inode_flags(struct ext4_inode_info *); diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index bc0f191..3676dae 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4446,7 +4446,7 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len) return -EOPNOTSUPP; if (mode & FALLOC_FL_PUNCH_HOLE) - return ext4_punch_hole(file, offset, len); + return ext4_punch_hole(inode, offset, len); ret = ext4_convert_inline_data(inode); if (ret) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index d6382b8..06e0fe2 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3580,9 +3580,8 @@ int ext4_can_truncate(struct inode *inode) * Returns: 0 on success or negative on failure */ -int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) +int ext4_punch_hole(struct inode *inode, loff_t offset, loff_t length) { - struct inode *inode = file_inode(file); struct super_block *sb = inode->i_sb; ext4_lblk_t first_block, stop_block; struct address_space *mapping = inode->i_mapping;