Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[pandora-kernel.git] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index f3e1083..b336cb9 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -651,6 +651,7 @@ struct block_device {
        int                     bd_openers;
        struct mutex            bd_mutex;       /* open/close mutex */
        struct list_head        bd_inodes;
+       void *                  bd_claiming;
        void *                  bd_holder;
        int                     bd_holders;
 #ifdef CONFIG_SYSFS
@@ -1428,7 +1429,8 @@ extern void dentry_unhash(struct dentry *dentry);
  * VFS file helper functions.
  */
 extern int file_permission(struct file *, int);
-
+extern void inode_init_owner(struct inode *inode, const struct inode *dir,
+                       mode_t mode);
 /*
  * VFS FS_IOC_FIEMAP helper definitions.
  */
@@ -1741,6 +1743,7 @@ struct file_system_type {
 
        struct lock_class_key s_lock_key;
        struct lock_class_key s_umount_key;
+       struct lock_class_key s_vfs_rename_key;
 
        struct lock_class_key i_lock_key;
        struct lock_class_key i_mutex_key;