diff options
author | J. Bruce Fields <bfields@redhat.com> | 2010-08-26 19:22:27 +0200 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2010-08-26 19:22:27 +0200 |
commit | f632265d0ffb5acf331252d98c64939849d96bb2 (patch) | |
tree | 31187d9a726bf1ca6ca12e26ad8e7c609eaf4d8b /fs/sysfs/sysfs.h | |
parent | nfsd4: fix downgrade/lock logic (diff) | |
parent | Linux 2.6.36-rc1 (diff) | |
download | linux-f632265d0ffb5acf331252d98c64939849d96bb2.tar.xz linux-f632265d0ffb5acf331252d98c64939849d96bb2.zip |
Merge commit 'v2.6.36-rc1' into HEAD
Diffstat (limited to 'fs/sysfs/sysfs.h')
-rw-r--r-- | fs/sysfs/sysfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h index 6a13105b5594..d9be60a2e956 100644 --- a/fs/sysfs/sysfs.h +++ b/fs/sysfs/sysfs.h @@ -198,7 +198,7 @@ static inline void __sysfs_put(struct sysfs_dirent *sd) * inode.c */ struct inode *sysfs_get_inode(struct super_block *sb, struct sysfs_dirent *sd); -void sysfs_delete_inode(struct inode *inode); +void sysfs_evict_inode(struct inode *inode); int sysfs_sd_setattr(struct sysfs_dirent *sd, struct iattr *iattr); int sysfs_permission(struct inode *inode, int mask); int sysfs_setattr(struct dentry *dentry, struct iattr *iattr); |