From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932470AbVKQSGW (ORCPT ); Thu, 17 Nov 2005 13:06:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932621AbVKQSGV (ORCPT ); Thu, 17 Nov 2005 13:06:21 -0500 Received: from mail.kroah.org ([69.55.234.183]:33442 "EHLO perch.kroah.org") by vger.kernel.org with ESMTP id S932622AbVKQSES (ORCPT ); Thu, 17 Nov 2005 13:04:18 -0500 Date: Thu, 17 Nov 2005 09:47:07 -0800 From: Greg Kroah-Hartman To: Linus Torvalds , Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-usb-devel@lists.sourceforge.net, hirofumi@mail.parknet.co.jp Subject: [patch 07/22] usbfs: usbfs_dir_inode_operations cleanup Message-ID: <20051117174707.GI11174@kroah.com> References: <20051117174227.007572000@press.kroah.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="usbfs_dir_inode_operations-cleanup.patch" In-Reply-To: <20051117174609.GA11174@kroah.com> User-Agent: Mutt/1.5.11 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org From: OGAWA Hirofumi Signed-off-by: OGAWA Hirofumi Signed-off-by: Greg Kroah-Hartman --- drivers/usb/core/inode.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) --- usb-2.6.orig/drivers/usb/core/inode.c +++ usb-2.6/drivers/usb/core/inode.c @@ -46,7 +46,6 @@ static struct super_operations usbfs_ops; static struct file_operations default_file_operations; -static struct inode_operations usbfs_dir_inode_operations; static struct vfsmount *usbfs_mount; static int usbfs_mount_count; /* = 0 */ static int ignore_mount = 0; @@ -262,7 +261,7 @@ static struct inode *usbfs_get_inode (st inode->i_fop = &default_file_operations; break; case S_IFDIR: - inode->i_op = &usbfs_dir_inode_operations; + inode->i_op = &simple_dir_inode_operations; inode->i_fop = &simple_dir_operations; /* directory inodes start off with i_nlink == 2 (for "." entry) */ @@ -417,10 +416,6 @@ static struct file_operations default_fi .llseek = default_file_lseek, }; -static struct inode_operations usbfs_dir_inode_operations = { - .lookup = simple_lookup, -}; - static struct super_operations usbfs_ops = { .statfs = simple_statfs, .drop_inode = generic_delete_inode, --