diff options
| author | James Morris <jmorris@namei.org> | 2009-09-10 18:04:49 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-09-10 18:04:49 -0400 |
| commit | a3c8b97396ef42edfb845788ba6f53b2a93ce980 (patch) | |
| tree | 530c5bdbc534618311dab3e0af245835af56db0f /fs/sysfs/dir.c | |
| parent | 74fca6a42863ffacaf7ba6f1936a9f228950f657 (diff) | |
| parent | 9f0ab4a3f0fdb1ff404d150618ace2fa069bb2e1 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/sysfs/dir.c')
| -rw-r--r-- | fs/sysfs/dir.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c index 14f2d71ea3ce..0050fc40e8c9 100644 --- a/fs/sysfs/dir.c +++ b/fs/sysfs/dir.c | |||
| @@ -760,6 +760,7 @@ static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry, | |||
| 760 | const struct inode_operations sysfs_dir_inode_operations = { | 760 | const struct inode_operations sysfs_dir_inode_operations = { |
| 761 | .lookup = sysfs_lookup, | 761 | .lookup = sysfs_lookup, |
| 762 | .setattr = sysfs_setattr, | 762 | .setattr = sysfs_setattr, |
| 763 | .setxattr = sysfs_setxattr, | ||
| 763 | }; | 764 | }; |
| 764 | 765 | ||
| 765 | static void remove_dir(struct sysfs_dirent *sd) | 766 | static void remove_dir(struct sysfs_dirent *sd) |