diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-16 10:21:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-16 10:21:59 -0700 |
| commit | 8dac6bee32425dd5145b40fa2307648cb7fb4d4a (patch) | |
| tree | b7165517729b755686f336b3066ebc982c8793ea /include/linux/sysfs.h | |
| parent | f8f44f09eaa2bfb40651e7fc6054d65c8091499a (diff) | |
| parent | d6e43f751f252c68ca69fa6d18665d88d69ef8b7 (diff) | |
| download | kernel_samsung_smdk4412-8dac6bee32425dd5145b40fa2307648cb7fb4d4a.zip kernel_samsung_smdk4412-8dac6bee32425dd5145b40fa2307648cb7fb4d4a.tar.gz kernel_samsung_smdk4412-8dac6bee32425dd5145b40fa2307648cb7fb4d4a.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
AFS: Use i_generation not i_version for the vnode uniquifier
AFS: Set s_id in the superblock to the volume name
vfs: Fix data corruption after failed write in __block_write_begin()
afs: afs_fill_page reads too much, or wrong data
VFS: Fix vfsmount overput on simultaneous automount
fix wrong iput on d_inode introduced by e6bc45d65d
Delay struct net freeing while there's a sysfs instance refering to it
afs: fix sget() races, close leak on umount
ubifs: fix sget races
ubifs: split allocation of ubifs_info into a separate function
fix leak in proc_set_super()
Diffstat (limited to 'include/linux/sysfs.h')
| -rw-r--r-- | include/linux/sysfs.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h index c3acda6..e2696d7 100644 --- a/include/linux/sysfs.h +++ b/include/linux/sysfs.h @@ -177,9 +177,6 @@ struct sysfs_dirent *sysfs_get_dirent(struct sysfs_dirent *parent_sd, struct sysfs_dirent *sysfs_get(struct sysfs_dirent *sd); void sysfs_put(struct sysfs_dirent *sd); -/* Called to clear a ns tag when it is no longer valid */ -void sysfs_exit_ns(enum kobj_ns_type type, const void *tag); - int __must_check sysfs_init(void); #else /* CONFIG_SYSFS */ @@ -338,10 +335,6 @@ static inline void sysfs_put(struct sysfs_dirent *sd) { } -static inline void sysfs_exit_ns(int type, const void *tag) -{ -} - static inline int __must_check sysfs_init(void) { return 0; |