diff options
author | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /fs/sysfs/file.c | |
parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'fs/sysfs/file.c')
-rw-r--r-- | fs/sysfs/file.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index d72c1ce48559..335288b9be0f 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c | |||
@@ -3,7 +3,7 @@ | |||
3 | */ | 3 | */ |
4 | 4 | ||
5 | #include <linux/module.h> | 5 | #include <linux/module.h> |
6 | #include <linux/dnotify.h> | 6 | #include <linux/fsnotify.h> |
7 | #include <linux/kobject.h> | 7 | #include <linux/kobject.h> |
8 | #include <linux/namei.h> | 8 | #include <linux/namei.h> |
9 | #include <asm/uaccess.h> | 9 | #include <asm/uaccess.h> |
@@ -391,9 +391,6 @@ int sysfs_create_file(struct kobject * kobj, const struct attribute * attr) | |||
391 | * sysfs_update_file - update the modified timestamp on an object attribute. | 391 | * sysfs_update_file - update the modified timestamp on an object attribute. |
392 | * @kobj: object we're acting for. | 392 | * @kobj: object we're acting for. |
393 | * @attr: attribute descriptor. | 393 | * @attr: attribute descriptor. |
394 | * | ||
395 | * Also call dnotify for the dentry, which lots of userspace programs | ||
396 | * use. | ||
397 | */ | 394 | */ |
398 | int sysfs_update_file(struct kobject * kobj, const struct attribute * attr) | 395 | int sysfs_update_file(struct kobject * kobj, const struct attribute * attr) |
399 | { | 396 | { |
@@ -408,7 +405,7 @@ int sysfs_update_file(struct kobject * kobj, const struct attribute * attr) | |||
408 | if (victim->d_inode && | 405 | if (victim->d_inode && |
409 | (victim->d_parent->d_inode == dir->d_inode)) { | 406 | (victim->d_parent->d_inode == dir->d_inode)) { |
410 | victim->d_inode->i_mtime = CURRENT_TIME; | 407 | victim->d_inode->i_mtime = CURRENT_TIME; |
411 | dnotify_parent(victim, DN_MODIFY); | 408 | fsnotify_modify(victim); |
412 | 409 | ||
413 | /** | 410 | /** |
414 | * Drop reference from initial sysfs_get_dentry(). | 411 | * Drop reference from initial sysfs_get_dentry(). |