diff options
author | Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> | 2006-09-20 03:38:00 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-10-18 15:49:54 -0400 |
commit | e42344514c6e8ca7f5427da9b1407b56550dfa01 (patch) | |
tree | 4dd26210cc0bb5147a455ef9b097266d0218c3b9 /fs/sysfs/file.c | |
parent | 722385f75efd82d9f480f0765a1e97a4d83cac0d (diff) |
sysfs: remove duplicated dput in sysfs_update_file
Following function can drops d_count twice against one reference
by lookup_one_len.
<SOURCE>
/**
* sysfs_update_file - update the modified timestamp on an object attribute.
* @kobj: object we're acting for.
* @attr: attribute descriptor.
*/
int sysfs_update_file(struct kobject * kobj, const struct attribute * attr)
{
struct dentry * dir = kobj->dentry;
struct dentry * victim;
int res = -ENOENT;
mutex_lock(&dir->d_inode->i_mutex);
victim = lookup_one_len(attr->name, dir, strlen(attr->name));
if (!IS_ERR(victim)) {
/* make sure dentry is really there */
if (victim->d_inode &&
(victim->d_parent->d_inode == dir->d_inode)) {
victim->d_inode->i_mtime = CURRENT_TIME;
fsnotify_modify(victim);
/**
* Drop reference from initial sysfs_get_dentry().
*/
dput(victim);
res = 0;
} else
d_drop(victim);
/**
* Drop the reference acquired from sysfs_get_dentry() above.
*/
dput(victim);
}
mutex_unlock(&dir->d_inode->i_mutex);
return res;
}
</SOURCE>
PCI-hotplug (drivers/pci/hotplug/pci_hotplug_core.c) is only user of
this function. I confirmed that dentry of /sys/bus/pci/slots/XXX/*
have negative d_count value.
This patch removes unnecessary dput().
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Acked-by: Maneesh Soni <maneesh@in.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/sysfs/file.c')
-rw-r--r-- | fs/sysfs/file.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index 146f1dedec84..93218ccb2f6b 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c | |||
@@ -483,11 +483,6 @@ int sysfs_update_file(struct kobject * kobj, const struct attribute * attr) | |||
483 | (victim->d_parent->d_inode == dir->d_inode)) { | 483 | (victim->d_parent->d_inode == dir->d_inode)) { |
484 | victim->d_inode->i_mtime = CURRENT_TIME; | 484 | victim->d_inode->i_mtime = CURRENT_TIME; |
485 | fsnotify_modify(victim); | 485 | fsnotify_modify(victim); |
486 | |||
487 | /** | ||
488 | * Drop reference from initial sysfs_get_dentry(). | ||
489 | */ | ||
490 | dput(victim); | ||
491 | res = 0; | 486 | res = 0; |
492 | } else | 487 | } else |
493 | d_drop(victim); | 488 | d_drop(victim); |