From bb4be1e150b280b910f4cc8052735168c46251c4 Mon Sep 17 00:00:00 2001 From: OGAWA Hirofumi Date: Thu, 17 Nov 2005 09:47:07 -0800 Subject: [PATCH] --- yaml --- r: 14354 b: refs/heads/master c: bc7cb323bab717660830211d50555dedf19e372e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/inode.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index e19cb2c2a658..ae99a8811247 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c611d2cd2f74988baa9a4c6cfc8a48064fd075e6 +refs/heads/master: bc7cb323bab717660830211d50555dedf19e372e diff --git a/trunk/drivers/usb/core/inode.c b/trunk/drivers/usb/core/inode.c index 12f490fdee8f..c44bbedec817 100644 --- a/trunk/drivers/usb/core/inode.c +++ b/trunk/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 (struct super_block *sb, int mode, dev_t de 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_file_operations = { .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,