1 files changed, 29 insertions, 43 deletions

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 891f7d642e5c..b1bcb275b596 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -152,6 +152,7 @@ struct inodes_stat_t {
 #define WRITE_SYNC_PLUG (WRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_NOIDLE))
 #define WRITE_SYNC      (WRITE_SYNC_PLUG | (1 << BIO_RW_UNPLUG))
 #define WRITE_ODIRECT_PLUG      (WRITE | (1 << BIO_RW_SYNCIO))
+#define WRITE_META      (WRITE | (1 << BIO_RW_META))
 #define SWRITE_SYNC_PLUG        \
                         (SWRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_NOIDLE))
 #define SWRITE_SYNC     (SWRITE_SYNC_PLUG | (1 << BIO_RW_UNPLUG))
@@ -1094,10 +1095,6 @@ struct file_lock {
 
 extern void send_sigio(struct fown_struct *fown, int fd, int band);
 
-/* fs/sync.c */
-extern int do_sync_mapping_range(struct address_space *mapping, loff_t offset,
-                        loff_t endbyte, unsigned int flags);
-
 #ifdef CONFIG_FILE_LOCKING
 extern int fcntl_getlk(struct file *, struct flock __user *);
 extern int fcntl_setlk(unsigned int, struct file *, unsigned int,
@@ -1590,7 +1587,7 @@ struct super_operations {
  * until that flag is cleared.  I_WILL_FREE, I_FREEING and I_CLEAR are set at
  * various stages of removing an inode.
  *
- * Two bits are used for locking and completion notification, I_LOCK and I_SYNC.
+ * Two bits are used for locking and completion notification, I_NEW and I_SYNC.
  *
  * I_DIRTY_SYNC         Inode is dirty, but doesn't have to be written on
  *                      fdatasync().  i_atime is the usual cause.
@@ -1599,8 +1596,14 @@ struct super_operations {
  *                      don't have to write inode on fdatasync() when only
  *                      mtime has changed in it.
  * I_DIRTY_PAGES        Inode has dirty pages.  Inode itself may be clean.
- * I_NEW                get_new_inode() sets i_state to I_LOCK|I_NEW.  Both
- *                      are cleared by unlock_new_inode(), called from iget().
+ * I_NEW                Serves as both a mutex and completion notification.
+ *                      New inodes set I_NEW.  If two processes both create
+ *                      the same inode, one of them will release its inode and
+ *                      wait for I_NEW to be released before returning.
+ *                      Inodes in I_WILL_FREE, I_FREEING or I_CLEAR state can
+ *                      also cause waiting on I_NEW, without I_NEW actually
+ *                      being set.  find_inode() uses this to prevent returning
+ *                      nearly-dead inodes.
  * I_WILL_FREE          Must be set when calling write_inode_now() if i_count
  *                      is zero.  I_FREEING must be set when I_WILL_FREE is
  *                      cleared.
@@ -1614,35 +1617,23 @@ struct super_operations {
  *                      prohibited for many purposes.  iget() must wait for
  *                      the inode to be completely released, then create it
  *                      anew.  Other functions will just ignore such inodes,
- *                      if appropriate.  I_LOCK is used for waiting.
+ *                      if appropriate.  I_NEW is used for waiting.
  *
- * I_LOCK               Serves as both a mutex and completion notification.
- *                      New inodes set I_LOCK.  If two processes both create
- *                      the same inode, one of them will release its inode and
- *                      wait for I_LOCK to be released before returning.
- *                      Inodes in I_WILL_FREE, I_FREEING or I_CLEAR state can
- *                      also cause waiting on I_LOCK, without I_LOCK actually
- *                      being set.  find_inode() uses this to prevent returning
- *                      nearly-dead inodes.
- * I_SYNC               Similar to I_LOCK, but limited in scope to writeback
- *                      of inode dirty data.  Having a separate lock for this
- *                      purpose reduces latency and prevents some filesystem-
- *                      specific deadlocks.
+ * I_SYNC               Synchonized write of dirty inode data.  The bits is
+ *                      set during data writeback, and cleared with a wakeup
+ *                      on the bit address once it is done.
  *
  * Q: What is the difference between I_WILL_FREE and I_FREEING?
- * Q: igrab() only checks on (I_FREEING|I_WILL_FREE).  Should it also check on
- *    I_CLEAR?  If not, why?
  */
 #define I_DIRTY_SYNC            1
 #define I_DIRTY_DATASYNC        2
 #define I_DIRTY_PAGES           4
-#define I_NEW                   8
+#define __I_NEW                 3
+#define I_NEW                   (1 << __I_NEW)
 #define I_WILL_FREE             16
 #define I_FREEING               32
 #define I_CLEAR                 64
-#define __I_LOCK                7
-#define I_LOCK                  (1 << __I_LOCK)
-#define __I_SYNC                8
+#define __I_SYNC                7
 #define I_SYNC                  (1 << __I_SYNC)
 
 #define I_DIRTY (I_DIRTY_SYNC | I_DIRTY_DATASYNC | I_DIRTY_PAGES)
@@ -2091,8 +2082,6 @@ extern int filemap_fdatawait_range(struct address_space *, loff_t lstart,
 extern int filemap_write_and_wait(struct address_space *mapping);
 extern int filemap_write_and_wait_range(struct address_space *mapping,
                                         loff_t lstart, loff_t lend);
-extern int wait_on_page_writeback_range(struct address_space *mapping,
-                                pgoff_t start, pgoff_t end);
 extern int __filemap_fdatawrite_range(struct address_space *mapping,
                                 loff_t start, loff_t end, int sync_mode);
 extern int filemap_fdatawrite_range(struct address_space *mapping,
@@ -2191,7 +2180,6 @@ static inline void insert_inode_hash(struct inode *inode) {
         __insert_inode_hash(inode, inode->i_ino);
 }
 
-extern struct file * get_empty_filp(void);
 extern void file_move(struct file *f, struct list_head *list);
 extern void file_kill(struct file *f);
 #ifdef CONFIG_BLOCK
@@ -2266,9 +2254,11 @@ ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
         int lock_type);
 
 enum {
-        DIO_LOCKING = 1, /* need locking between buffered and direct access */
-        DIO_NO_LOCKING,  /* bdev; no locking at all between buffered/direct */
-        DIO_OWN_LOCKING, /* filesystem locks buffered and direct internally */
+        /* need locking between buffered and direct access */
+        DIO_LOCKING     = 0x01,
+
+        /* filesystem does not support filling holes */
+        DIO_SKIP_HOLES  = 0x02,
 };
 
 static inline ssize_t blockdev_direct_IO(int rw, struct kiocb *iocb,
@@ -2277,7 +2267,8 @@ static inline ssize_t blockdev_direct_IO(int rw, struct kiocb *iocb,
         dio_iodone_t end_io)
 {
         return __blockdev_direct_IO(rw, iocb, inode, bdev, iov, offset,
-                                nr_segs, get_block, end_io, DIO_LOCKING);
+                                    nr_segs, get_block, end_io,
+                                    DIO_LOCKING | DIO_SKIP_HOLES);
 }
 
 static inline ssize_t blockdev_direct_IO_no_locking(int rw, struct kiocb *iocb,
@@ -2286,16 +2277,7 @@ static inline ssize_t blockdev_direct_IO_no_locking(int rw, struct kiocb *iocb,
         dio_iodone_t end_io)
 {
         return __blockdev_direct_IO(rw, iocb, inode, bdev, iov, offset,
-                                nr_segs, get_block, end_io, DIO_NO_LOCKING);
-}
-
-static inline ssize_t blockdev_direct_IO_own_locking(int rw, struct kiocb *iocb,
-        struct inode *inode, struct block_device *bdev, const struct iovec *iov,
-        loff_t offset, unsigned long nr_segs, get_block_t get_block,
-        dio_iodone_t end_io)
-{
-        return __blockdev_direct_IO(rw, iocb, inode, bdev, iov, offset,
-                                nr_segs, get_block, end_io, DIO_OWN_LOCKING);
+                                nr_segs, get_block, end_io, 0);
 }
 #endif
 
@@ -2315,6 +2297,7 @@ extern const struct inode_operations page_symlink_inode_operations;
 extern int generic_readlink(struct dentry *, char __user *, int);
 extern void generic_fillattr(struct inode *, struct kstat *);
 extern int vfs_getattr(struct vfsmount *, struct dentry *, struct kstat *);
+void __inode_add_bytes(struct inode *inode, loff_t bytes);
 void inode_add_bytes(struct inode *inode, loff_t bytes);
 void inode_sub_bytes(struct inode *inode, loff_t bytes);
 loff_t inode_get_bytes(struct inode *inode);
@@ -2480,5 +2463,8 @@ int proc_nr_files(struct ctl_table *table, int write,
 
 int __init get_filesystem_list(char *buf);
 
+#define ACC_MODE(x) ("\004\002\006\006"[(x)&O_ACCMODE])
+#define OPEN_FMODE(flag) ((__force fmode_t)((flag + 1) & O_ACCMODE))
+
 #endif /* __KERNEL__ */
 #endif /* _LINUX_FS_H */