diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 19:05:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 19:05:55 -0700 |
| commit | bc84e0a160e383deb56568f4e03bc51b1ce16775 (patch) | |
| tree | 3c8cf1ae23c2f9c165bd7ce63a40b1d5c3aee275 /include/linux/fs.h | |
| parent | a92910723a5af54f81373875fd95133c88df94bd (diff) | |
| parent | f8f95702f0c4529b0f59488f4509608f0c160e77 (diff) | |
| download | blackbird-op-linux-bc84e0a160e383deb56568f4e03bc51b1ce16775.tar.gz blackbird-op-linux-bc84e0a160e383deb56568f4e03bc51b1ce16775.zip | |
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:
[PATCH] sanitize locate_fd()
[PATCH] sanitize unshare_files/reset_files_struct
[PATCH] sanitize handling of shared descriptor tables in failing execve()
[PATCH] close race in unshare_files()
[PATCH] restore sane ->umount_begin() API
cifs: timeout dfs automounts +little fix.
Diffstat (limited to 'include/linux/fs.h')
| -rw-r--r-- | include/linux/fs.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 6556f2f967e5..d6d7c52055c6 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1309,7 +1309,7 @@ struct super_operations { int (*statfs) (struct dentry *, struct kstatfs *); int (*remount_fs) (struct super_block *, int *, char *); void (*clear_inode) (struct inode *); - void (*umount_begin) (struct vfsmount *, int); + void (*umount_begin) (struct super_block *); int (*show_options)(struct seq_file *, struct vfsmount *); int (*show_stats)(struct seq_file *, struct vfsmount *); @@ -2034,9 +2034,6 @@ static inline ino_t parent_ino(struct dentry *dentry) return res; } -/* kernel/fork.c */ -extern int unshare_files(void); - /* Transaction based IO helpers */ /* |
