From patchwork Sun Dec 22 21:49:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 304532 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 17CDC2C00A3 for ; Mon, 23 Dec 2013 08:51:02 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756686Ab3LVVup (ORCPT ); Sun, 22 Dec 2013 16:50:45 -0500 Received: from mga09.intel.com ([134.134.136.24]:20678 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756087Ab3LVVuY (ORCPT ); Sun, 22 Dec 2013 16:50:24 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 22 Dec 2013 13:46:33 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.95,533,1384329600"; d="scan'208";a="428654183" Received: from unknown (HELO rizzo.int.wil.cx) ([10.255.15.254]) by orsmga001.jf.intel.com with ESMTP; 22 Dec 2013 13:50:18 -0800 Received: by rizzo.int.wil.cx (Postfix, from userid 1000) id 0BE0423A605; Sun, 22 Dec 2013 16:50:18 -0500 (EST) From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org Cc: Matthew Wilcox Subject: [PATCH v4 16/22] ext2: Remove ext2_aops_xip Date: Sun, 22 Dec 2013 16:49:43 -0500 Message-Id: X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: References: In-Reply-To: References: Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org We shouldn't need a special address_space_operations any more Signed-off-by: Matthew Wilcox --- fs/ext2/ext2.h | 1 - fs/ext2/inode.c | 7 +------ fs/ext2/namei.c | 4 ++-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/fs/ext2/ext2.h b/fs/ext2/ext2.h index d9a17d0..f39599e 100644 --- a/fs/ext2/ext2.h +++ b/fs/ext2/ext2.h @@ -789,7 +789,6 @@ extern const struct file_operations ext2_xip_file_operations; /* inode.c */ extern const struct address_space_operations ext2_aops; -extern const struct address_space_operations ext2_aops_xip; extern const struct address_space_operations ext2_nobh_aops; /* namei.c */ diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index af0fa94..9eadd78 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c @@ -890,11 +890,6 @@ const struct address_space_operations ext2_aops = { .error_remove_page = generic_error_remove_page, }; -const struct address_space_operations ext2_aops_xip = { - .bmap = ext2_bmap, - .direct_IO = ext2_direct_IO, -}; - const struct address_space_operations ext2_nobh_aops = { .readpage = ext2_readpage, .readpages = ext2_readpages, @@ -1393,7 +1388,7 @@ struct inode *ext2_iget (struct super_block *sb, unsigned long ino) if (S_ISREG(inode->i_mode)) { inode->i_op = &ext2_file_inode_operations; if (test_opt(inode->i_sb, XIP)) { - inode->i_mapping->a_ops = &ext2_aops_xip; + inode->i_mapping->a_ops = &ext2_aops; inode->i_fop = &ext2_xip_file_operations; } else if (test_opt(inode->i_sb, NOBH)) { inode->i_mapping->a_ops = &ext2_nobh_aops; diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c index 76d33b9..2fc20ca 100644 --- a/fs/ext2/namei.c +++ b/fs/ext2/namei.c @@ -105,7 +105,7 @@ static int ext2_create (struct inode * dir, struct dentry * dentry, umode_t mode inode->i_op = &ext2_file_inode_operations; if (test_opt(inode->i_sb, XIP)) { - inode->i_mapping->a_ops = &ext2_aops_xip; + inode->i_mapping->a_ops = &ext2_aops; inode->i_fop = &ext2_xip_file_operations; } else if (test_opt(inode->i_sb, NOBH)) { inode->i_mapping->a_ops = &ext2_nobh_aops; @@ -126,7 +126,7 @@ static int ext2_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode) inode->i_op = &ext2_file_inode_operations; if (test_opt(inode->i_sb, XIP)) { - inode->i_mapping->a_ops = &ext2_aops_xip; + inode->i_mapping->a_ops = &ext2_aops; inode->i_fop = &ext2_xip_file_operations; } else if (test_opt(inode->i_sb, NOBH)) { inode->i_mapping->a_ops = &ext2_nobh_aops;