# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.588 -> 1.589 # drivers/hotplug/pci_hotplug_core.c 1.3 -> 1.4 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 02/08/20 greg@kroah.com 1.589 # PCI Hotplug: fixed oops when accessing pcihpfs. # -------------------------------------------- # diff -Nru a/drivers/hotplug/pci_hotplug_core.c b/drivers/hotplug/pci_hotplug_core.c --- a/drivers/hotplug/pci_hotplug_core.c Wed Aug 21 11:23:25 2002 +++ b/drivers/hotplug/pci_hotplug_core.c Wed Aug 21 11:23:25 2002 @@ -76,7 +76,6 @@ }; static struct super_operations pcihpfs_ops; -static struct file_operations pcihpfs_dir_operations; static struct file_operations default_file_operations; static struct inode_operations pcihpfs_dir_inode_operations; static struct vfsmount *pcihpfs_mount; /* one of the mounts of our fs for reference counting */ @@ -122,7 +121,7 @@ break; case S_IFDIR: inode->i_op = &pcihpfs_dir_inode_operations; - inode->i_fop = &pcihpfs_dir_operations; + inode->i_fop = &dcache_dir_ops; break; } } @@ -234,11 +233,6 @@ return 0; } - -static struct file_operations pcihpfs_dir_operations = { - read: generic_read_dir, - readdir: dcache_readdir, -}; static struct file_operations default_file_operations = { read: default_read_file,