Merge branch 'next' into upstream-merge

Conflicts:
	fs/ext4/inode.c
	fs/ext4/mballoc.c
	include/trace/events/ext4.h

1 files changed, 8 insertions, 0 deletions

diff --git a/include/linux/fs.h b/include/linux/fs.h
index b2a6009cba10..6ed7ace74b7c 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -32,6 +32,12 @@
 #define SEEK_END        2       /* seek relative to end of file */
 #define SEEK_MAX        SEEK_END
 
+struct fstrim_range {
+        uint64_t start;
+        uint64_t len;
+        uint64_t minlen;
+};
+
 /* And dynamically-tunable limits and defaults: */
 struct files_stat_struct {
         unsigned long nr_files;         /* read only */
@@ -317,6 +323,7 @@ struct inodes_stat_t {
 #define FIGETBSZ   _IO(0x00,2)  /* get the block size used for bmap */
 #define FIFREEZE        _IOWR('X', 119, int)    /* Freeze */
 #define FITHAW          _IOWR('X', 120, int)    /* Thaw */
+#define FITRIM          _IOWR('X', 121, struct fstrim_range)    /* Trim */
 
 #define FS_IOC_GETFLAGS                 _IOR('f', 1, long)
 #define FS_IOC_SETFLAGS                 _IOW('f', 2, long)
@@ -1604,6 +1611,7 @@ struct super_operations {
         ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);
 #endif
         int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);
+        int (*trim_fs) (struct super_block *, struct fstrim_range *);
 };
 
 /*