lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

Browse Source 
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  class: Free the class private data in class_release
  sysfs: sysfs_sd_setattr set iattrs unconditionally
This commit is contained in:
Linus Torvalds
2010-02-16 16:55:13 -08:00
parent 5d67767047 18d19c9645
commit 1ed10aa8e9
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/base/class.c
View File

@@ -59,6 +59,8 @@ static void class_release(struct kobject *kobj)
else else
pr_debug("class '%s' does not have a release() function, " pr_debug("class '%s' does not have a release() function, "
"be careful\n", class->name); "be careful\n", class->name);
kfree(cp);
} }
static struct sysfs_ops class_sysfs_ops = { static struct sysfs_ops class_sysfs_ops = {

3
fs/sysfs/inode.c
View File

@@ -81,7 +81,7 @@ int sysfs_sd_setattr(struct sysfs_dirent *sd, struct iattr * iattr)
if (!sd_attrs) if (!sd_attrs)
return -ENOMEM; return -ENOMEM;
sd->s_iattr = sd_attrs; sd->s_iattr = sd_attrs;
} else { }
/* attributes were changed at least once in past */ /* attributes were changed at least once in past */
iattrs = &sd_attrs->ia_iattr; iattrs = &sd_attrs->ia_iattr;
@@ -99,7 +99,6 @@ int sysfs_sd_setattr(struct sysfs_dirent *sd, struct iattr * iattr)
umode_t mode = iattr->ia_mode; umode_t mode = iattr->ia_mode;
iattrs->ia_mode = sd->s_mode = mode; iattrs->ia_mode = sd->s_mode = mode;
} }
}
return 0; return 0;
} }