1 files changed, 86 insertions, 13 deletions

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index cc7ca4e87144..1c127213363a 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -378,14 +378,22 @@ struct flex_groups {
 #define EXT4_PROJINHERIT_FL             0x20000000 /* Create with parents projid */
 #define EXT4_RESERVED_FL                0x80000000 /* reserved for ext4 lib */
 
-#define EXT4_FL_USER_VISIBLE            0x004BDFFF /* User visible flags */
-#define EXT4_FL_USER_MODIFIABLE         0x004380FF /* User modifiable flags */
+#define EXT4_FL_USER_VISIBLE            0x304BDFFF /* User visible flags */
+#define EXT4_FL_USER_MODIFIABLE         0x204380FF /* User modifiable flags */
+
+#define EXT4_FL_XFLAG_VISIBLE           (EXT4_SYNC_FL | \
+                                         EXT4_IMMUTABLE_FL | \
+                                         EXT4_APPEND_FL | \
+                                         EXT4_NODUMP_FL | \
+                                         EXT4_NOATIME_FL | \
+                                         EXT4_PROJINHERIT_FL)
 
 /* Flags that should be inherited by new inodes from their parent. */
 #define EXT4_FL_INHERITED (EXT4_SECRM_FL | EXT4_UNRM_FL | EXT4_COMPR_FL |\
                            EXT4_SYNC_FL | EXT4_NODUMP_FL | EXT4_NOATIME_FL |\
                            EXT4_NOCOMPR_FL | EXT4_JOURNAL_DATA_FL |\
-                           EXT4_NOTAIL_FL | EXT4_DIRSYNC_FL)
+                           EXT4_NOTAIL_FL | EXT4_DIRSYNC_FL |\
+                           EXT4_PROJINHERIT_FL)
 
 /* Flags that are appropriate for regular files (all but dir-specific ones). */
 #define EXT4_REG_FLMASK (~(EXT4_DIRSYNC_FL | EXT4_TOPDIR_FL))
@@ -555,10 +563,12 @@ enum {
 #define EXT4_GET_BLOCKS_NO_NORMALIZE            0x0040
         /* Request will not result in inode size update (user for fallocate) */
 #define EXT4_GET_BLOCKS_KEEP_SIZE               0x0080
-        /* Do not take i_data_sem locking in ext4_map_blocks */
-#define EXT4_GET_BLOCKS_NO_LOCK                 0x0100
         /* Convert written extents to unwritten */
-#define EXT4_GET_BLOCKS_CONVERT_UNWRITTEN       0x0200
+#define EXT4_GET_BLOCKS_CONVERT_UNWRITTEN       0x0100
+        /* Write zeros to newly created written extents */
+#define EXT4_GET_BLOCKS_ZERO                    0x0200
+#define EXT4_GET_BLOCKS_CREATE_ZERO             (EXT4_GET_BLOCKS_CREATE |\
+                                        EXT4_GET_BLOCKS_ZERO)
 
 /*
  * The bit position of these flags must not overlap with any of the
@@ -616,6 +626,46 @@ enum {
 #define EXT4_IOC_GET_ENCRYPTION_PWSALT  _IOW('f', 20, __u8[16])
 #define EXT4_IOC_GET_ENCRYPTION_POLICY  _IOW('f', 21, struct ext4_encryption_policy)
 
+#ifndef FS_IOC_FSGETXATTR
+/* Until the uapi changes get merged for project quota... */
+
+#define FS_IOC_FSGETXATTR               _IOR('X', 31, struct fsxattr)
+#define FS_IOC_FSSETXATTR               _IOW('X', 32, struct fsxattr)
+
+/*
+ * Structure for FS_IOC_FSGETXATTR and FS_IOC_FSSETXATTR.
+ */
+struct fsxattr {
+        __u32           fsx_xflags;     /* xflags field value (get/set) */
+        __u32           fsx_extsize;    /* extsize field value (get/set)*/
+        __u32           fsx_nextents;   /* nextents field value (get)   */
+        __u32           fsx_projid;     /* project identifier (get/set) */
+        unsigned char   fsx_pad[12];
+};
+
+/*
+ * Flags for the fsx_xflags field
+ */
+#define FS_XFLAG_REALTIME       0x00000001      /* data in realtime volume */
+#define FS_XFLAG_PREALLOC       0x00000002      /* preallocated file extents */
+#define FS_XFLAG_IMMUTABLE      0x00000008      /* file cannot be modified */
+#define FS_XFLAG_APPEND         0x00000010      /* all writes append */
+#define FS_XFLAG_SYNC           0x00000020      /* all writes synchronous */
+#define FS_XFLAG_NOATIME        0x00000040      /* do not update access time */
+#define FS_XFLAG_NODUMP         0x00000080      /* do not include in backups */
+#define FS_XFLAG_RTINHERIT      0x00000100      /* create with rt bit set */
+#define FS_XFLAG_PROJINHERIT    0x00000200      /* create with parents projid */
+#define FS_XFLAG_NOSYMLINKS     0x00000400      /* disallow symlink creation */
+#define FS_XFLAG_EXTSIZE        0x00000800      /* extent size allocator hint */
+#define FS_XFLAG_EXTSZINHERIT   0x00001000      /* inherit inode extent size */
+#define FS_XFLAG_NODEFRAG       0x00002000      /* do not defragment */
+#define FS_XFLAG_FILESTREAM     0x00004000      /* use filestream allocator */
+#define FS_XFLAG_HASATTR        0x80000000      /* no DIFLAG for this */
+#endif /* !defined(FS_IOC_FSGETXATTR) */
+
+#define EXT4_IOC_FSGETXATTR             FS_IOC_FSGETXATTR
+#define EXT4_IOC_FSSETXATTR             FS_IOC_FSSETXATTR
+
 #if defined(__KERNEL__) && defined(CONFIG_COMPAT)
 /*
  * ioctl commands in 32 bit emulation
@@ -910,6 +960,15 @@ struct ext4_inode_info {
          * by other means, so we have i_data_sem.
          */
         struct rw_semaphore i_data_sem;
+        /*
+         * i_mmap_sem is for serializing page faults with truncate / punch hole
+         * operations. We have to make sure that new page cannot be faulted in
+         * a section of the inode that is being punched. We cannot easily use
+         * i_data_sem for this since we need protection for the whole punch
+         * operation and i_data_sem ranks below transaction start so we have
+         * to occasionally drop it.
+         */
+        struct rw_semaphore i_mmap_sem;
         struct inode vfs_inode;
         struct jbd2_inode *jinode;
 
@@ -993,6 +1052,7 @@ struct ext4_inode_info {
         /* Encryption params */
         struct ext4_crypt_info *i_crypt_info;
 #endif
+        kprojid_t i_projid;
 };
 
 /*
@@ -1248,7 +1308,7 @@ struct ext4_super_block {
 #endif
 
 /* Number of quota types we support */
-#define EXT4_MAXQUOTAS 2
+#define EXT4_MAXQUOTAS 3
 
 /*
  * fourth extended-fs super-block data in memory
@@ -1754,7 +1814,8 @@ EXT4_FEATURE_INCOMPAT_FUNCS(encrypt,		ENCRYPT)
                                          EXT4_FEATURE_RO_COMPAT_HUGE_FILE |\
                                          EXT4_FEATURE_RO_COMPAT_BIGALLOC |\
                                          EXT4_FEATURE_RO_COMPAT_METADATA_CSUM|\
-                                         EXT4_FEATURE_RO_COMPAT_QUOTA)
+                                         EXT4_FEATURE_RO_COMPAT_QUOTA |\
+                                         EXT4_FEATURE_RO_COMPAT_PROJECT)
 
 #define EXTN_FEATURE_FUNCS(ver) \
 static inline bool ext4_has_unknown_ext##ver##_compat_features(struct super_block *sb) \
@@ -1796,6 +1857,11 @@ static inline bool ext4_has_incompat_features(struct super_block *sb)
 #define EXT4_DEF_RESUID         0
 #define EXT4_DEF_RESGID         0
 
+/*
+ * Default project ID
+ */
+#define EXT4_DEF_PROJID         0
+
 #define EXT4_DEF_INODE_READAHEAD_BLKS   32
 
 /*
@@ -2234,7 +2300,8 @@ void ext4_restore_control_page(struct page *data_page);
 struct page *ext4_encrypt(struct inode *inode,
                           struct page *plaintext_page);
 int ext4_decrypt(struct page *page);
-int ext4_encrypted_zeroout(struct inode *inode, struct ext4_extent *ex);
+int ext4_encrypted_zeroout(struct inode *inode, ext4_lblk_t lblk,
+                           ext4_fsblk_t pblk, ext4_lblk_t len);
 
 #ifdef CONFIG_EXT4_FS_ENCRYPTION
 int ext4_init_crypto(void);
@@ -2440,8 +2507,8 @@ struct buffer_head *ext4_getblk(handle_t *, struct inode *, ext4_lblk_t, int);
 struct buffer_head *ext4_bread(handle_t *, struct inode *, ext4_lblk_t, int);
 int ext4_get_block_write(struct inode *inode, sector_t iblock,
                          struct buffer_head *bh_result, int create);
-int ext4_get_block_dax(struct inode *inode, sector_t iblock,
-                         struct buffer_head *bh_result, int create);
+int ext4_dax_mmap_get_block(struct inode *inode, sector_t iblock,
+                            struct buffer_head *bh_result, int create);
 int ext4_get_block(struct inode *inode, sector_t iblock,
                                 struct buffer_head *bh_result, int create);
 int ext4_da_get_block_prep(struct inode *inode, sector_t iblock,
@@ -2484,9 +2551,13 @@ extern int ext4_chunk_trans_blocks(struct inode *, int nrblocks);
 extern int ext4_zero_partial_blocks(handle_t *handle, struct inode *inode,
                              loff_t lstart, loff_t lend);
 extern int ext4_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf);
+extern int ext4_filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
 extern qsize_t *ext4_get_reserved_space(struct inode *inode);
+extern int ext4_get_projid(struct inode *inode, kprojid_t *projid);
 extern void ext4_da_update_reserve_space(struct inode *inode,
                                         int used, int quota_claim);
+extern int ext4_issue_zeroout(struct inode *inode, ext4_lblk_t lblk,
+                              ext4_fsblk_t pblk, ext4_lblk_t len);
 
 /* indirect.c */
 extern int ext4_ind_map_blocks(handle_t *handle, struct inode *inode,
@@ -2848,6 +2919,9 @@ static inline int ext4_update_inode_size(struct inode *inode, loff_t newsize)
         return changed;
 }
 
+int ext4_update_disksize_before_punch(struct inode *inode, loff_t offset,
+                                      loff_t len);
+
 struct ext4_group_info {
         unsigned long   bb_state;
         struct rb_root  bb_free_root;
@@ -2986,8 +3060,7 @@ extern int ext4_da_write_inline_data_end(struct inode *inode, loff_t pos,
                                          struct page *page);
 extern int ext4_try_add_inline_entry(handle_t *handle,
                                      struct ext4_filename *fname,
-                                     struct dentry *dentry,
-                                     struct inode *inode);
+                                     struct inode *dir, struct inode *inode);
 extern int ext4_try_create_inline_dir(handle_t *handle,
                                       struct inode *parent,
                                       struct inode *inode);