aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/fs.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-03 00:09:10 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-03 00:09:10 -0400
commit8fe74cf053de7ad2124a894996f84fa890a81093 (patch)
tree77dcd8fbf33ce53a3821942233962fb28c6f2848 /include/linux/fs.h
parentc2eb2fa6d2b6fe122d3479ec5b28d978418b2698 (diff)
parentced117c73edc917e96dea7cca98c91383f0792f7 (diff)
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: Remove two unneeded exports and make two symbols static in fs/mpage.c Cleanup after commit 585d3bc06f4ca57f975a5a1f698f65a45ea66225 Trim includes of fdtable.h Don't crap into descriptor table in binfmt_som Trim includes in binfmt_elf Don't mess with descriptor table in load_elf_binary() Get rid of indirect include of fs_struct.h New helper - current_umask() check_unsafe_exec() doesn't care about signal handlers sharing New locking/refcounting for fs_struct Take fs_struct handling to new file (fs/fs_struct.c) Get rid of bumping fs_struct refcount in pivot_root(2) Kill unsharing fs_struct in __set_personality()
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r--include/linux/fs.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 61211ad823fe..a09e17c8f5fd 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1741,6 +1741,8 @@ extern void drop_collected_mounts(struct vfsmount *);
1741 1741
1742extern int vfs_statfs(struct dentry *, struct kstatfs *); 1742extern int vfs_statfs(struct dentry *, struct kstatfs *);
1743 1743
1744extern int current_umask(void);
1745
1744/* /sys/fs */ 1746/* /sys/fs */
1745extern struct kobject *fs_kobj; 1747extern struct kobject *fs_kobj;
1746 1748
@@ -1885,6 +1887,18 @@ extern int fsync_super(struct super_block *);
1885extern int fsync_no_super(struct block_device *); 1887extern int fsync_no_super(struct block_device *);
1886#else 1888#else
1887static inline void bd_forget(struct inode *inode) {} 1889static inline void bd_forget(struct inode *inode) {}
1890static inline int sync_blockdev(struct block_device *bdev) { return 0; }
1891static inline void invalidate_bdev(struct block_device *bdev) {}
1892
1893static inline struct super_block *freeze_bdev(struct block_device *sb)
1894{
1895 return NULL;
1896}
1897
1898static inline int thaw_bdev(struct block_device *bdev, struct super_block *sb)
1899{
1900 return 0;
1901}
1888#endif 1902#endif
1889extern const struct file_operations def_blk_fops; 1903extern const struct file_operations def_blk_fops;
1890extern const struct file_operations def_chr_fops; 1904extern const struct file_operations def_chr_fops;