diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2002-07-23 01:41:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2002-07-23 01:41:03 -0700 |
| commit | 6462f8da01cfc5fbd871f2bbdb5f49b4bcd5624c (patch) | |
| tree | bfd801185be2911d5fda247536b2cda619ae4c3e | |
| parent | b43e708b4a1692618184cc1ee5edaedf81904df0 (diff) | |
| parent | 94f04c1a18b5aff9d8f7d8344e7c3eab82ee364b (diff) | |
Merge kroah.com:/home/greg/linux/BK/bleeding_edge-2.5
into kroah.com:/home/greg/linux/BK/pci_hp-2.5
| -rw-r--r-- | drivers/hotplug/pci_hotplug_core.c | 5 | ||||
| -rw-r--r-- | drivers/hotplug/pci_hotplug_util.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/hotplug/pci_hotplug_core.c b/drivers/hotplug/pci_hotplug_core.c index d66175b528e8..6e1833ae9cc7 100644 --- a/drivers/hotplug/pci_hotplug_core.c +++ b/drivers/hotplug/pci_hotplug_core.c @@ -48,7 +48,7 @@ #define MY_NAME THIS_MODULE->name #endif -#define dbg(fmt, arg...) do { if (debug) printk(KERN_DEBUG "%s: %s: " fmt, MY_NAME, __FUNCTION__, ## arg); } while (0) +#define dbg(fmt, arg...) do { if (debug) printk(KERN_DEBUG "%s: %s: " fmt , MY_NAME , __FUNCTION__ , ## arg); } while (0) #define err(format, arg...) printk(KERN_ERR "%s: " format , MY_NAME , ## arg) #define info(format, arg...) printk(KERN_INFO "%s: " format , MY_NAME , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg) @@ -109,6 +109,9 @@ static struct inode *pcihpfs_get_inode (struct super_block *sb, int mode, int de case S_IFDIR: inode->i_op = &pcihpfs_dir_inode_operations; inode->i_fop = &simple_dir_operations; + + /* directory inodes start off with i_nlink == 2 (for "." entry) */ + inode->i_nlink++; break; } } diff --git a/drivers/hotplug/pci_hotplug_util.c b/drivers/hotplug/pci_hotplug_util.c index fe0730cde0d1..18648af6fc11 100644 --- a/drivers/hotplug/pci_hotplug_util.c +++ b/drivers/hotplug/pci_hotplug_util.c @@ -41,7 +41,7 @@ #define MY_NAME THIS_MODULE->name #endif -#define dbg(fmt, arg...) do { if (debug) printk(KERN_DEBUG "%s: %s: " fmt, MY_NAME, __FUNCTION__, ## arg); } while (0) +#define dbg(fmt, arg...) do { if (debug) printk(KERN_DEBUG "%s: %s: " fmt , MY_NAME , __FUNCTION__ , ## arg); } while (0) #define err(format, arg...) printk(KERN_ERR "%s: " format , MY_NAME , ## arg) #define info(format, arg...) printk(KERN_INFO "%s: " format , MY_NAME , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg) |