LU-9339 ldiskfs: Make ldiskfs buildable on kernels with no project quota

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / rhel7 / ext4-projid-xfs-ioctls.patch

diff --git a/ldiskfs/kernel_patches/patches/rhel7/ext4-projid-xfs-ioctls.patch b/ldiskfs/kernel_patches/patches/rhel7/ext4-projid-xfs-ioctls.patch
index dd9e8cb..4cc7c11 100644 (file)
--- a/ldiskfs/kernel_patches/patches/rhel7/ext4-projid-xfs-ioctls.patch
+++ b/ldiskfs/kernel_patches/patches/rhel7/ext4-projid-xfs-ioctls.patch
@@ -1,8 +1,8 @@
-diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
-index 00f317c..312abfd 100644
---- a/fs/ext4/ext4.h
-+++ b/fs/ext4/ext4.h
-@@ -383,6 +383,13 @@ struct flex_groups {
+Index: linux-stage/fs/ext4/ext4.h
+===================================================================
+--- linux-stage.orig/fs/ext4/ext4.h
++++ linux-stage/fs/ext4/ext4.h
+@@ -398,6 +398,13 @@ struct flex_groups {
  #define EXT4_FL_USER_VISIBLE          0x304BDFFF /* User visible flags */
  #define EXT4_FL_USER_MODIFIABLE               0x204380FF /* User modifiable flags */
  
@@ -16,19 +16,55 @@ index 00f317c..312abfd 100644
  /* 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 |\
-@@ -607,6 +614,8 @@ enum {
- #define EXT4_IOC_RESIZE_FS            _IOW('f', 16, __u64)
+@@ -621,6 +628,44 @@ enum {
  #define EXT4_IOC_SWAP_BOOT            _IO('f', 17)
  #define EXT4_IOC_PRECACHE_EXTENTS     _IO('f', 18)
+ 
++#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)
  /*
-diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
-index 70c66d3..5857658 100644
---- a/fs/ext4/ioctl.c
-+++ b/fs/ext4/ioctl.c
+  * ioctl commands in 32 bit emulation
+Index: linux-stage/fs/ext4/ioctl.c
+===================================================================
+--- linux-stage.orig/fs/ext4/ioctl.c
++++ linux-stage/fs/ext4/ioctl.c
 @@ -15,6 +15,7 @@
  #include <linux/mount.h>
  #include <linux/file.h>
@@ -277,7 +313,7 @@ index 70c66d3..5857658 100644
  long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
        struct inode *inode = file_inode(filp);
-@@ -213,11 +447,7 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+@@ -213,11 +447,7 @@ long ext4_ioctl(struct file *filp, unsig
                flags = ei->i_flags & EXT4_FL_USER_VISIBLE;
                return put_user(flags, (int __user *) arg);
        case EXT4_IOC_SETFLAGS: {
@@ -290,7 +326,7 @@ index 70c66d3..5857658 100644
  
                if (!inode_owner_or_capable(inode))
                        return -EACCES;
-@@ -231,89 +461,8 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+@@ -231,89 +461,8 @@ long ext4_ioctl(struct file *filp, unsig
  
                flags = ext4_mask_flags(inode->i_mode, flags);
  
@@ -381,7 +417,7 @@ index 70c66d3..5857658 100644
                mutex_unlock(&inode->i_mutex);
                mnt_drop_write_file(filp);
                return err;
-@@ -622,6 +771,62 @@ resizefs_out:
+@@ -617,6 +766,62 @@ resizefs_out:
        }
        case EXT4_IOC_PRECACHE_EXTENTS:
                return ext4_ext_precache(inode);