3 files changed, 80 insertions, 37 deletions

diff --git a/include/linux/fs.h b/include/linux/fs.h
index a877ed3f389f..ea80f1cdff06 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2572,6 +2572,9 @@ static inline ssize_t blockdev_direct_IO(int rw, struct kiocb *iocb,
 void inode_dio_wait(struct inode *inode);
 void inode_dio_done(struct inode *inode);
 
+extern void inode_set_flags(struct inode *inode, unsigned int flags,
+                            unsigned int mask);
+
 extern const struct file_operations generic_ro_fops;
 
 #define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))
diff --git a/include/linux/mbcache.h b/include/linux/mbcache.h
index 5525d370701d..6a392e7a723a 100644
--- a/include/linux/mbcache.h
+++ b/include/linux/mbcache.h
@@ -3,19 +3,21 @@
 
   (C) 2001 by Andreas Gruenbacher, <a.gruenbacher@computer.org>
 */
-
 struct mb_cache_entry {
         struct list_head                e_lru_list;
         struct mb_cache                 *e_cache;
         unsigned short                  e_used;
         unsigned short                  e_queued;
+        atomic_t                        e_refcnt;
         struct block_device             *e_bdev;
         sector_t                        e_block;
-        struct list_head                e_block_list;
+        struct hlist_bl_node            e_block_list;
         struct {
-                struct list_head        o_list;
+                struct hlist_bl_node    o_list;
                 unsigned int            o_key;
         } e_index;
+        struct hlist_bl_head            *e_block_hash_p;
+        struct hlist_bl_head            *e_index_hash_p;
 };
 
 struct mb_cache {
@@ -25,8 +27,8 @@ struct mb_cache {
         int                             c_max_entries;
         int                             c_bucket_bits;
         struct kmem_cache               *c_entry_cache;
-        struct list_head                *c_block_hash;
-        struct list_head                *c_index_hash;
+        struct hlist_bl_head            *c_block_hash;
+        struct hlist_bl_head            *c_index_hash;
 };
 
 /* Functions on caches */
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 197d3125df2a..010ea89eeb0e 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -16,6 +16,15 @@ struct mpage_da_data;
 struct ext4_map_blocks;
 struct extent_status;
 
+/* shim until we merge in the xfs_collapse_range branch */
+#ifndef FALLOC_FL_COLLAPSE_RANGE
+#define FALLOC_FL_COLLAPSE_RANGE        0x08
+#endif
+
+#ifndef FALLOC_FL_ZERO_RANGE
+#define FALLOC_FL_ZERO_RANGE           0x10
+#endif
+
 #define EXT4_I(inode) (container_of(inode, struct ext4_inode_info, vfs_inode))
 
 #define show_mballoc_flags(flags) __print_flags(flags, "|",     \
@@ -68,6 +77,13 @@ struct extent_status;
         { EXTENT_STATUS_DELAYED,        "D" },                  \
         { EXTENT_STATUS_HOLE,           "H" })
 
+#define show_falloc_mode(mode) __print_flags(mode, "|",         \
+        { FALLOC_FL_KEEP_SIZE,          "KEEP_SIZE"},           \
+        { FALLOC_FL_PUNCH_HOLE,         "PUNCH_HOLE"},          \
+        { FALLOC_FL_NO_HIDE_STALE,      "NO_HIDE_STALE"},       \
+        { FALLOC_FL_COLLAPSE_RANGE,     "COLLAPSE_RANGE"},      \
+        { FALLOC_FL_ZERO_RANGE,         "ZERO_RANGE"})
+
 
 TRACE_EVENT(ext4_free_inode,
         TP_PROTO(struct inode *inode),
@@ -1328,7 +1344,7 @@ TRACE_EVENT(ext4_direct_IO_exit,
                   __entry->rw, __entry->ret)
 );
 
-TRACE_EVENT(ext4_fallocate_enter,
+DECLARE_EVENT_CLASS(ext4__fallocate_mode,
         TP_PROTO(struct inode *inode, loff_t offset, loff_t len, int mode),
 
         TP_ARGS(inode, offset, len, mode),
@@ -1336,23 +1352,45 @@ TRACE_EVENT(ext4_fallocate_enter,
         TP_STRUCT__entry(
                 __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
-                __field(        loff_t, pos                     )
-                __field(        loff_t, len                     )
+                __field(        loff_t, offset                  )
+                __field(        loff_t, len                     )
                 __field(        int,    mode                    )
         ),
 
         TP_fast_assign(
                 __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
-                __entry->pos    = offset;
+                __entry->offset = offset;
                 __entry->len    = len;
                 __entry->mode   = mode;
         ),
 
-        TP_printk("dev %d,%d ino %lu pos %lld len %lld mode %d",
+        TP_printk("dev %d,%d ino %lu offset %lld len %lld mode %s",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
-                  (unsigned long) __entry->ino, __entry->pos,
-                  __entry->len, __entry->mode)
+                  (unsigned long) __entry->ino,
+                  __entry->offset, __entry->len,
+                  show_falloc_mode(__entry->mode))
+);
+
+DEFINE_EVENT(ext4__fallocate_mode, ext4_fallocate_enter,
+
+        TP_PROTO(struct inode *inode, loff_t offset, loff_t len, int mode),
+
+        TP_ARGS(inode, offset, len, mode)
+);
+
+DEFINE_EVENT(ext4__fallocate_mode, ext4_punch_hole,
+
+        TP_PROTO(struct inode *inode, loff_t offset, loff_t len, int mode),
+
+        TP_ARGS(inode, offset, len, mode)
+);
+
+DEFINE_EVENT(ext4__fallocate_mode, ext4_zero_range,
+
+        TP_PROTO(struct inode *inode, loff_t offset, loff_t len, int mode),
+
+        TP_ARGS(inode, offset, len, mode)
 );
 
 TRACE_EVENT(ext4_fallocate_exit,
@@ -1384,31 +1422,6 @@ TRACE_EVENT(ext4_fallocate_exit,
                   __entry->ret)
 );
 
-TRACE_EVENT(ext4_punch_hole,
-        TP_PROTO(struct inode *inode, loff_t offset, loff_t len),
-
-        TP_ARGS(inode, offset, len),
-
-        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
-                __field(        ino_t,  ino                     )
-                __field(        loff_t, offset                  )
-                __field(        loff_t, len                     )
-        ),
-
-        TP_fast_assign(
-                __entry->dev    = inode->i_sb->s_dev;
-                __entry->ino    = inode->i_ino;
-                __entry->offset = offset;
-                __entry->len    = len;
-        ),
-
-        TP_printk("dev %d,%d ino %lu offset %lld len %lld",
-                  MAJOR(__entry->dev), MINOR(__entry->dev),
-                  (unsigned long) __entry->ino,
-                  __entry->offset, __entry->len)
-);
-
 TRACE_EVENT(ext4_unlink_enter,
         TP_PROTO(struct inode *parent, struct dentry *dentry),
 
@@ -2410,6 +2423,31 @@ TRACE_EVENT(ext4_es_shrink_exit,
                   __entry->shrunk_nr, __entry->cache_cnt)
 );
 
+TRACE_EVENT(ext4_collapse_range,
+        TP_PROTO(struct inode *inode, loff_t offset, loff_t len),
+
+        TP_ARGS(inode, offset, len),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(ino_t,  ino)
+                __field(loff_t, offset)
+                __field(loff_t, len)
+        ),
+
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->offset = offset;
+                __entry->len    = len;
+        ),
+
+        TP_printk("dev %d,%d ino %lu offset %lld len %lld",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->offset, __entry->len)
+);
+
 #endif /* _TRACE_EXT4_H */
 
 /* This part must be outside protection */