diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-23 21:34:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-23 21:34:43 -0700 |
| commit | de80af4cc9c30318224b8520dc76a7d097e64cbd (patch) | |
| tree | 0bc587a0b5433e41cd1e7feefa2359561fe71fbd /fs/sysfs/bin.c | |
| parent | 405d2965597fd9dbd822a5a8c1c66c925a942d6e (diff) | |
| parent | 5f1835da79df8607ecbd69f648b5b140b7a0b8ba (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
sysfs: don't warn on removal of a nonexistent binary file
HOWTO: latest lxr url address changed
HOWTO: korean translation of Documentation/HOWTO
Fix Off-by-one in /sys/module/*/refcnt
sysfs: fix locking in sysfs_lookup() and sysfs_rename_dir()
Diffstat (limited to 'fs/sysfs/bin.c')
| -rw-r--r-- | fs/sysfs/bin.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c index 135353f8a29..5afe2a26f5d 100644 --- a/fs/sysfs/bin.c +++ b/fs/sysfs/bin.c @@ -248,12 +248,7 @@ int sysfs_create_bin_file(struct kobject * kobj, struct bin_attribute * attr) void sysfs_remove_bin_file(struct kobject * kobj, struct bin_attribute * attr) { - if (sysfs_hash_and_remove(kobj->sd, attr->attr.name) < 0) { - printk(KERN_ERR "%s: " - "bad dentry or inode or no such file: \"%s\"\n", - __FUNCTION__, attr->attr.name); - dump_stack(); - } + sysfs_hash_and_remove(kobj->sd, attr->attr.name); } EXPORT_SYMBOL_GPL(sysfs_create_bin_file); |