1 files changed, 66 insertions, 18 deletions

diff --git a/include/linux/fs.h b/include/linux/fs.h
index dba4cbd157ee..6eafbe309483 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -27,6 +27,10 @@
 #define BLOCK_SIZE_BITS 10
 #define BLOCK_SIZE (1<<BLOCK_SIZE_BITS)
 
+#define SEEK_SET        0       /* seek relative to beginning of file */
+#define SEEK_CUR        1       /* seek relative to current file position */
+#define SEEK_END        2       /* seek relative to end of file */
+
 /* And dynamically-tunable limits and defaults: */
 struct files_stat_struct {
         int nr_files;           /* read only */
@@ -88,9 +92,10 @@ extern int dir_notify_enable;
 #define FS_REQUIRES_DEV 1 
 #define FS_BINARY_MOUNTDATA 2
 #define FS_REVAL_DOT    16384   /* Check the paths ".", ".." for staleness */
-#define FS_ODD_RENAME   32768   /* Temporary stuff; will go away as soon
-                                  * as nfs_rename() will be cleaned up
-                                  */
+#define FS_RENAME_DOES_D_MOVE   32768   /* FS will handle d_move()
+                                         * during rename() internally.
+                                         */
+
 /*
  * These are the fs-independent mount-flags: up to 32 flags are supported
  */
@@ -392,7 +397,7 @@ struct address_space {
         unsigned int            truncate_count; /* Cover race condition with truncate */
         unsigned long           nrpages;        /* number of total pages */
         pgoff_t                 writeback_index;/* writeback starts here */
-        struct address_space_operations *a_ops; /* methods */
+        const struct address_space_operations *a_ops;   /* methods */
         unsigned long           flags;          /* error bits/gfp mask */
         struct backing_dev_info *backing_dev_info; /* device readahead, etc */
         spinlock_t              private_lock;   /* for use by the address_space */
@@ -436,6 +441,21 @@ struct block_device {
 };
 
 /*
+ * bdev->bd_mutex nesting subclasses for the lock validator:
+ *
+ * 0: normal
+ * 1: 'whole'
+ * 2: 'partition'
+ */
+enum bdev_bd_mutex_lock_class
+{
+        BD_MUTEX_NORMAL,
+        BD_MUTEX_WHOLE,
+        BD_MUTEX_PARTITION
+};
+
+
+/*
  * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
  * radix trees
  */
@@ -492,7 +512,6 @@ struct inode {
         struct timespec         i_mtime;
         struct timespec         i_ctime;
         unsigned int            i_blkbits;
-        unsigned long           i_blksize;
         unsigned long           i_version;
         blkcnt_t                i_blocks;
         unsigned short          i_bytes;
@@ -508,11 +527,12 @@ struct inode {
 #ifdef CONFIG_QUOTA
         struct dquot            *i_dquot[MAXQUOTAS];
 #endif
-        /* These three should probably be a union */
         struct list_head        i_devices;
-        struct pipe_inode_info  *i_pipe;
-        struct block_device     *i_bdev;
-        struct cdev             *i_cdev;
+        union {
+                struct pipe_inode_info  *i_pipe;
+                struct block_device     *i_bdev;
+                struct cdev             *i_cdev;
+        };
         int                     i_cindex;
 
         __u32                   i_generation;
@@ -533,16 +553,36 @@ struct inode {
         unsigned int            i_flags;
 
         atomic_t                i_writecount;
+#ifdef CONFIG_SECURITY
         void                    *i_security;
-        union {
-                void            *generic_ip;
-        } u;
+#endif
+        void                    *i_private; /* fs or device private pointer */
 #ifdef __NEED_I_SIZE_ORDERED
         seqcount_t              i_size_seqcount;
 #endif
 };
 
 /*
+ * inode->i_mutex nesting subclasses for the lock validator:
+ *
+ * 0: the object of the current VFS operation
+ * 1: parent
+ * 2: child/target
+ * 3: quota file
+ *
+ * The locking order between these classes is
+ * parent -> child -> normal -> xattr -> quota
+ */
+enum inode_i_mutex_lock_class
+{
+        I_MUTEX_NORMAL,
+        I_MUTEX_PARENT,
+        I_MUTEX_CHILD,
+        I_MUTEX_XATTR,
+        I_MUTEX_QUOTA
+};
+
+/*
  * NOTE: in a 32bit arch with a preemptable kernel and
  * an UP compile the i_size_read/write must be atomic
  * with respect to the local cpu (unlike with preempt disabled),
@@ -607,7 +647,6 @@ struct fown_struct {
         rwlock_t lock;          /* protects pid, uid, euid fields */
         int pid;                /* pid or -pgrp where SIGIO should be sent */
         uid_t uid, euid;        /* uid/euid of process setting the owner */
-        void *security;
         int signum;             /* posix.1b rt signal to be delivered on IO */
 };
 
@@ -650,8 +689,9 @@ struct file {
         struct file_ra_state    f_ra;
 
         unsigned long           f_version;
+#ifdef CONFIG_SECURITY
         void                    *f_security;
-
+#endif
         /* needed for tty driver, and maybe others */
         void                    *private_data;
 
@@ -682,6 +722,7 @@ extern spinlock_t files_lock;
 #define FL_POSIX        1
 #define FL_FLOCK        2
 #define FL_ACCESS       8       /* not trying to lock, just looking */
+#define FL_EXISTS       16      /* when unlocking, test for existence */
 #define FL_LEASE        32      /* lease held on this file */
 #define FL_CLOSE        64      /* unlock on close */
 #define FL_SLEEP        128     /* A blocking lock */
@@ -838,7 +879,9 @@ struct super_block {
         int                     s_syncing;
         int                     s_need_sync_fs;
         atomic_t                s_active;
+#ifdef CONFIG_SECURITY
         void                    *s_security;
+#endif
         struct xattr_handler    **s_xattr;
 
         struct list_head        s_inodes;       /* all inodes */
@@ -1100,13 +1143,14 @@ 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 super_block *);
+        void (*umount_begin) (struct vfsmount *, int);
 
         int (*show_options)(struct seq_file *, struct vfsmount *);
         int (*show_stats)(struct seq_file *, struct vfsmount *);
-
+#ifdef CONFIG_QUOTA
         ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t);
         ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);
+#endif
 };
 
 /* Inode state bits.  Protected by inode_lock. */
@@ -1276,6 +1320,8 @@ struct file_system_type {
         struct module *owner;
         struct file_system_type * next;
         struct list_head fs_supers;
+        struct lock_class_key s_lock_key;
+        struct lock_class_key s_umount_key;
 };
 
 extern int get_sb_bdev(struct file_system_type *fs_type,
@@ -1404,8 +1450,9 @@ extern void bd_set_size(struct block_device *, loff_t size);
 extern void bd_forget(struct inode *inode);
 extern void bdput(struct block_device *);
 extern struct block_device *open_by_devnum(dev_t, unsigned);
+extern struct block_device *open_partition_by_devnum(dev_t, unsigned);
 extern const struct file_operations def_blk_fops;
-extern struct address_space_operations def_blk_aops;
+extern const struct address_space_operations def_blk_aops;
 extern const struct file_operations def_chr_fops;
 extern const struct file_operations bad_sock_fops;
 extern const struct file_operations def_fifo_fops;
@@ -1414,6 +1461,7 @@ extern int blkdev_ioctl(struct inode *, struct file *, unsigned, unsigned long);
 extern long compat_blkdev_ioctl(struct file *, unsigned, unsigned long);
 extern int blkdev_get(struct block_device *, mode_t, unsigned);
 extern int blkdev_put(struct block_device *);
+extern int blkdev_put_partition(struct block_device *);
 extern int bd_claim(struct block_device *, void *);
 extern void bd_release(struct block_device *);
 #ifdef CONFIG_SYSFS
@@ -1767,7 +1815,7 @@ extern struct inode_operations simple_dir_inode_operations;
 struct tree_descr { char *name; const struct file_operations *ops; int mode; };
 struct dentry *d_alloc_name(struct dentry *, const char *);
 extern int simple_fill_super(struct super_block *, int, struct tree_descr *);
-extern int simple_pin_fs(char *name, struct vfsmount **mount, int *count);
+extern int simple_pin_fs(struct file_system_type *, struct vfsmount **mount, int *count);
 extern void simple_release_fs(struct vfsmount **mount, int *count);
 
 extern ssize_t simple_read_from_buffer(void __user *, size_t, loff_t *, const void *, size_t);