ldiskfs/kernel_patches/patches/rhel7/ext4-projid-xfs-ioctls.patch

   1 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
   2 index 31317c9..39b31aa 100644
   3 --- a/fs/ext4/ext4.h
   4 +++ b/fs/ext4/ext4.h
   5 @@ -398,6 +398,13 @@ struct flex_groups {
   6  #define EXT4_FL_USER_VISIBLE           0x304BDFFF /* User visible flags */
   7  #define EXT4_FL_USER_MODIFIABLE                0x204380FF /* User modifiable flags */
   8
   9 +#define EXT4_FL_XFLAG_VISIBLE          (EXT4_SYNC_FL | \
  10 +                                        EXT4_IMMUTABLE_FL | \
  11 +                                        EXT4_APPEND_FL | \
  12 +                                        EXT4_NODUMP_FL | \
  13 +                                        EXT4_NOATIME_FL | \
  14 +                                        EXT4_PROJINHERIT_FL)
  15 +
  16  /* Flags that should be inherited by new inodes from their parent. */
  17  #define EXT4_FL_INHERITED (EXT4_SECRM_FL | EXT4_UNRM_FL | EXT4_COMPR_FL |\
  18                            EXT4_SYNC_FL | EXT4_NODUMP_FL | EXT4_NOATIME_FL |\
  19 @@ -621,6 +628,44 @@ enum {
  20  #define EXT4_IOC_SWAP_BOOT             _IO('f', 17)
  21  #define EXT4_IOC_PRECACHE_EXTENTS      _IO('f', 18)
  22
  23 +#ifndef FS_IOC_FSGETXATTR
  24 +/* Until the uapi changes get merged for project quota... */
  25 +#define FS_IOC_FSGETXATTR               _IOR('X', 31, struct fsxattr)
  26 +#define FS_IOC_FSSETXATTR               _IOW('X', 32, struct fsxattr)
  27 +/*
  28 + * Structure for FS_IOC_FSGETXATTR and FS_IOC_FSSETXATTR.
  29 + */
  30 +struct fsxattr {
  31 +       __u32           fsx_xflags;     /* xflags field value (get/set) */
  32 +       __u32           fsx_extsize;    /* extsize field value (get/set)*/
  33 +       __u32           fsx_nextents;   /* nextents field value (get)   */
  34 +       __u32           fsx_projid;     /* project identifier (get/set) */
  35 +       unsigned char   fsx_pad[12];
  36 +};
  37 +
  38 +/*
  39 + * Flags for the fsx_xflags field
  40 + */
  41 +#define FS_XFLAG_REALTIME      0x00000001      /* data in realtime volume */
  42 +#define FS_XFLAG_PREALLOC      0x00000002      /* preallocated file extents */
  43 +#define FS_XFLAG_IMMUTABLE     0x00000008      /* file cannot be modified */
  44 +#define FS_XFLAG_APPEND                0x00000010      /* all writes append */
  45 +#define FS_XFLAG_SYNC          0x00000020      /* all writes synchronous */
  46 +#define FS_XFLAG_NOATIME       0x00000040      /* do not update access time */
  47 +#define FS_XFLAG_NODUMP                0x00000080      /* do not include in backups */
  48 +#define FS_XFLAG_RTINHERIT     0x00000100      /* create with rt bit set */
  49 +#define FS_XFLAG_PROJINHERIT   0x00000200      /* create with parents projid */
  50 +#define FS_XFLAG_NOSYMLINKS    0x00000400      /* disallow symlink creation */
  51 +#define FS_XFLAG_EXTSIZE       0x00000800      /* extent size allocator hint */
  52 +#define FS_XFLAG_EXTSZINHERIT  0x00001000      /* inherit inode extent size */
  53 +#define FS_XFLAG_NODEFRAG      0x00002000      /* do not defragment */
  54 +#define FS_XFLAG_FILESTREAM    0x00004000      /* use filestream allocator */
  55 +#define FS_XFLAG_HASATTR       0x80000000      /* no DIFLAG for this */
  56 +#endif /* !defined(FS_IOC_FSGETXATTR) */
  57 +
  58 +#define EXT4_IOC_FSGETXATTR            FS_IOC_FSGETXATTR
  59 +#define EXT4_IOC_FSSETXATTR            FS_IOC_FSSETXATTR
  60 +
  61  #if defined(__KERNEL__) && defined(CONFIG_COMPAT)
  62  /*
  63   * ioctl commands in 32 bit emulation
  64 @@ -2336,6 +2381,7 @@ extern int ext4_ind_remove_space(handle_t *handle, struct inode *inode,
  65  /* ioctl.c */
  66  extern long ext4_ioctl(struct file *, unsigned int, unsigned long);
  67  extern long ext4_compat_ioctl(struct file *, unsigned int, unsigned long);
  68 +extern int __ext4_ioctl_setproject(struct inode *inode, __u32 projid);
  69
  70  /* migrate.c */
  71  extern int ext4_ext_migrate(struct inode *);
  72 diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
  73 index bfda18a..a4443e9 100644
  74 --- a/fs/ext4/ioctl.c
  75 +++ b/fs/ext4/ioctl.c
  76 @@ -15,6 +15,7 @@
  77  #include <linux/mount.h>
  78  #include <linux/file.h>
  79  #include <asm/uaccess.h>
  80 +#include <linux/quotaops.h>
  81  #include "ext4_jbd2.h"
  82  #include "ext4.h"
  83
  84 @@ -198,6 +199,251 @@ journal_err_out:
  85         return err;
  86  }
  87
  88 +static int ext4_ioctl_setflags(struct inode *inode,
  89 +                              unsigned int flags)
  90 +{
  91 +       struct ext4_inode_info *ei = EXT4_I(inode);
  92 +       handle_t *handle = NULL;
  93 +       int err = EPERM, migrate = 0;
  94 +       struct ext4_iloc iloc;
  95 +       unsigned int oldflags, mask, i;
  96 +       unsigned int jflag;
  97 +
  98 +       /* Is it quota file? Do not allow user to mess with it */
  99 +       if (IS_NOQUOTA(inode))
 100 +               goto flags_out;
 101 +
 102 +       oldflags = ei->i_flags;
 103 +
 104 +       /* The JOURNAL_DATA flag is modifiable only by root */
 105 +       jflag = flags & EXT4_JOURNAL_DATA_FL;
 106 +
 107 +       /*
 108 +        * The IMMUTABLE and APPEND_ONLY flags can only be changed by
 109 +        * the relevant capability.
 110 +        *
 111 +        * This test looks nicer. Thanks to Pauline Middelink
 112 +        */
 113 +       if ((flags ^ oldflags) & (EXT4_APPEND_FL | EXT4_IMMUTABLE_FL)) {
 114 +               if (!capable(CAP_LINUX_IMMUTABLE))
 115 +                       goto flags_out;
 116 +       }
 117 +
 118 +       /*
 119 +        * The JOURNAL_DATA flag can only be changed by
 120 +        * the relevant capability.
 121 +        */
 122 +       if ((jflag ^ oldflags) & (EXT4_JOURNAL_DATA_FL)) {
 123 +               if (!capable(CAP_SYS_RESOURCE))
 124 +                       goto flags_out;
 125 +       }
 126 +       if ((flags ^ oldflags) & EXT4_EXTENTS_FL)
 127 +               migrate = 1;
 128 +
 129 +       if (flags & EXT4_EOFBLOCKS_FL) {
 130 +               /* we don't support adding EOFBLOCKS flag */
 131 +               if (!(oldflags & EXT4_EOFBLOCKS_FL)) {
 132 +                       err = -EOPNOTSUPP;
 133 +                       goto flags_out;
 134 +               }
 135 +       } else if (oldflags & EXT4_EOFBLOCKS_FL)
 136 +               ext4_truncate(inode);
 137 +
 138 +       handle = ext4_journal_start(inode, EXT4_HT_INODE, 1);
 139 +       if (IS_ERR(handle)) {
 140 +               err = PTR_ERR(handle);
 141 +               goto flags_out;
 142 +       }
 143 +       if (IS_SYNC(inode))
 144 +               ext4_handle_sync(handle);
 145 +       err = ext4_reserve_inode_write(handle, inode, &iloc);
 146 +       if (err)
 147 +               goto flags_err;
 148 +
 149 +       for (i = 0, mask = 1; i < 32; i++, mask <<= 1) {
 150 +               if (!(mask & EXT4_FL_USER_MODIFIABLE))
 151 +                       continue;
 152 +               if (mask & flags)
 153 +                       ext4_set_inode_flag(inode, i);
 154 +               else
 155 +                       ext4_clear_inode_flag(inode, i);
 156 +       }
 157 +
 158 +       ext4_set_inode_flags(inode);
 159 +       inode->i_ctime = ext4_current_time(inode);
 160 +
 161 +       err = ext4_mark_iloc_dirty(handle, inode, &iloc);
 162 +flags_err:
 163 +       ext4_journal_stop(handle);
 164 +       if (err)
 165 +               goto flags_out;
 166 +
 167 +       if ((jflag ^ oldflags) & (EXT4_JOURNAL_DATA_FL))
 168 +               err = ext4_change_inode_journal_flag(inode, jflag);
 169 +       if (err)
 170 +               goto flags_out;
 171 +       if (migrate) {
 172 +               if (flags & EXT4_EXTENTS_FL)
 173 +                       err = ext4_ext_migrate(inode);
 174 +               else
 175 +                       err = ext4_ind_migrate(inode);
 176 +       }
 177 +
 178 +flags_out:
 179 +       return err;
 180 +}
 181 +
 182 +#ifdef CONFIG_QUOTA
 183 +int __ext4_ioctl_setproject(struct inode *inode, __u32 projid)
 184 +{
 185 +       struct super_block *sb = inode->i_sb;
 186 +       struct ext4_inode_info *ei = EXT4_I(inode);
 187 +       int err, rc;
 188 +       handle_t *handle;
 189 +       kprojid_t kprojid;
 190 +       struct ext4_iloc iloc;
 191 +       struct ext4_inode *raw_inode;
 192 +       struct dquot *transfer_to[EXT4_MAXQUOTAS] = { };
 193 +
 194 +       if (!EXT4_HAS_RO_COMPAT_FEATURE(sb,
 195 +                       EXT4_FEATURE_RO_COMPAT_PROJECT)) {
 196 +               BUG_ON(__kprojid_val(EXT4_I(inode)->i_projid)
 197 +                      != EXT4_DEF_PROJID);
 198 +               if (projid != EXT4_DEF_PROJID)
 199 +                       return -EOPNOTSUPP;
 200 +               else
 201 +                       return 0;
 202 +       }
 203 +
 204 +       if (EXT4_INODE_SIZE(sb) <= EXT4_GOOD_OLD_INODE_SIZE)
 205 +               return -EOPNOTSUPP;
 206 +
 207 +       kprojid = make_kprojid(&init_user_ns, (projid_t)projid);
 208 +
 209 +       if (projid_eq(kprojid, EXT4_I(inode)->i_projid))
 210 +               return 0;
 211 +
 212 +       err = -EPERM;
 213 +       mutex_lock(&inode->i_mutex);
 214 +       /* Is it quota file? Do not allow user to mess with it */
 215 +       if (IS_NOQUOTA(inode))
 216 +               goto out_unlock;
 217 +
 218 +       err = ext4_get_inode_loc(inode, &iloc);
 219 +       if (err)
 220 +               goto out_unlock;
 221 +
 222 +       raw_inode = ext4_raw_inode(&iloc);
 223 +       if (!EXT4_FITS_IN_INODE(raw_inode, ei, i_projid)) {
 224 +               err = -EOVERFLOW;
 225 +               brelse(iloc.bh);
 226 +               goto out_unlock;
 227 +       }
 228 +       brelse(iloc.bh);
 229 +
 230 +       dquot_initialize(inode);
 231 +
 232 +       handle = ext4_journal_start(inode, EXT4_HT_QUOTA,
 233 +               EXT4_QUOTA_INIT_BLOCKS(sb) +
 234 +               EXT4_QUOTA_DEL_BLOCKS(sb) + 3);
 235 +       if (IS_ERR(handle)) {
 236 +               err = PTR_ERR(handle);
 237 +               goto out_unlock;
 238 +       }
 239 +
 240 +       err = ext4_reserve_inode_write(handle, inode, &iloc);
 241 +       if (err)
 242 +               goto out_stop;
 243 +
 244 +       transfer_to[PRJQUOTA] = dqget(sb, make_kqid_projid(kprojid));
 245 +       if (transfer_to[PRJQUOTA]) {
 246 +               err = __dquot_transfer(inode, transfer_to);
 247 +               dqput(transfer_to[PRJQUOTA]);
 248 +               if (err)
 249 +                       goto out_dirty;
 250 +       }
 251 +
 252 +       EXT4_I(inode)->i_projid = kprojid;
 253 +       inode->i_ctime = ext4_current_time(inode);
 254 +out_dirty:
 255 +       rc = ext4_mark_iloc_dirty(handle, inode, &iloc);
 256 +       if (!err)
 257 +               err = rc;
 258 +out_stop:
 259 +       ext4_journal_stop(handle);
 260 +out_unlock:
 261 +       mutex_unlock(&inode->i_mutex);
 262 +       return err;
 263 +
 264 +
 265 +}
 266 +EXPORT_SYMBOL(__ext4_ioctl_setproject);
 267 +
 268 +static int ext4_ioctl_setproject(struct file *filp, __u32 projid)
 269 +{
 270 +       int err;
 271 +       struct inode *inode = file_inode(filp);
 272 +
 273 +       err = mnt_want_write_file(filp);
 274 +       if (err)
 275 +               return err;
 276 +
 277 +       err = __ext4_ioctl_setproject(inode, projid);
 278 +
 279 +       mnt_drop_write_file(filp);
 280 +       return err;
 281 +}
 282 +#else
 283 +static int ext4_ioctl_setproject(struct file *filp, __u32 projid)
 284 +{
 285 +       if (projid != EXT4_DEF_PROJID)
 286 +               return -EOPNOTSUPP;
 287 +       return 0;
 288 +}
 289 +#endif
 290 +
 291 +
 292 +/* Transfer internal flags to xflags */
 293 +static inline __u32 ext4_iflags_to_xflags(unsigned long iflags)
 294 +{
 295 +       __u32 xflags = 0;
 296 +
 297 +       if (iflags & EXT4_SYNC_FL)
 298 +               xflags |= FS_XFLAG_SYNC;
 299 +       if (iflags & EXT4_IMMUTABLE_FL)
 300 +               xflags |= FS_XFLAG_IMMUTABLE;
 301 +       if (iflags & EXT4_APPEND_FL)
 302 +               xflags |= FS_XFLAG_APPEND;
 303 +       if (iflags & EXT4_NODUMP_FL)
 304 +               xflags |= FS_XFLAG_NODUMP;
 305 +       if (iflags & EXT4_NOATIME_FL)
 306 +               xflags |= FS_XFLAG_NOATIME;
 307 +       if (iflags & EXT4_PROJINHERIT_FL)
 308 +               xflags |= FS_XFLAG_PROJINHERIT;
 309 +       return xflags;
 310 +}
 311 +
 312 +/* Transfer xflags flags to internal */
 313 +static inline unsigned long ext4_xflags_to_iflags(__u32 xflags)
 314 +{
 315 +       unsigned long iflags = 0;
 316 +
 317 +       if (xflags & FS_XFLAG_SYNC)
 318 +               iflags |= EXT4_SYNC_FL;
 319 +       if (xflags & FS_XFLAG_IMMUTABLE)
 320 +               iflags |= EXT4_IMMUTABLE_FL;
 321 +       if (xflags & FS_XFLAG_APPEND)
 322 +               iflags |= EXT4_APPEND_FL;
 323 +       if (xflags & FS_XFLAG_NODUMP)
 324 +               iflags |= EXT4_NODUMP_FL;
 325 +       if (xflags & FS_XFLAG_NOATIME)
 326 +               iflags |= EXT4_NOATIME_FL;
 327 +       if (xflags & FS_XFLAG_PROJINHERIT)
 328 +               iflags |= EXT4_PROJINHERIT_FL;
 329 +
 330 +       return iflags;
 331 +}
 332 +
 333  long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 334  {
 335         struct inode *inode = file_inode(filp);
 336 @@ -213,11 +459,7 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 337                 flags = ei->i_flags & EXT4_FL_USER_VISIBLE;
 338                 return put_user(flags, (int __user *) arg);
 339         case EXT4_IOC_SETFLAGS: {
 340 -               handle_t *handle = NULL;
 341 -               int err, migrate = 0;
 342 -               struct ext4_iloc iloc;
 343 -               unsigned int oldflags, mask, i;
 344 -               unsigned int jflag;
 345 +               int err;
 346
 347                 if (!inode_owner_or_capable(inode))
 348                         return -EACCES;
 349 @@ -231,89 +473,8 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 350
 351                 flags = ext4_mask_flags(inode->i_mode, flags);
 352
 353 -               err = -EPERM;
 354                 mutex_lock(&inode->i_mutex);
 355 -               /* Is it quota file? Do not allow user to mess with it */
 356 -               if (IS_NOQUOTA(inode))
 357 -                       goto flags_out;
 358 -
 359 -               oldflags = ei->i_flags;
 360 -
 361 -               /* The JOURNAL_DATA flag is modifiable only by root */
 362 -               jflag = flags & EXT4_JOURNAL_DATA_FL;
 363 -
 364 -               /*
 365 -                * The IMMUTABLE and APPEND_ONLY flags can only be changed by
 366 -                * the relevant capability.
 367 -                *
 368 -                * This test looks nicer. Thanks to Pauline Middelink
 369 -                */
 370 -               if ((flags ^ oldflags) & (EXT4_APPEND_FL | EXT4_IMMUTABLE_FL)) {
 371 -                       if (!capable(CAP_LINUX_IMMUTABLE))
 372 -                               goto flags_out;
 373 -               }
 374 -
 375 -               /*
 376 -                * The JOURNAL_DATA flag can only be changed by
 377 -                * the relevant capability.
 378 -                */
 379 -               if ((jflag ^ oldflags) & (EXT4_JOURNAL_DATA_FL)) {
 380 -                       if (!capable(CAP_SYS_RESOURCE))
 381 -                               goto flags_out;
 382 -               }
 383 -               if ((flags ^ oldflags) & EXT4_EXTENTS_FL)
 384 -                       migrate = 1;
 385 -
 386 -               if (flags & EXT4_EOFBLOCKS_FL) {
 387 -                       /* we don't support adding EOFBLOCKS flag */
 388 -                       if (!(oldflags & EXT4_EOFBLOCKS_FL)) {
 389 -                               err = -EOPNOTSUPP;
 390 -                               goto flags_out;
 391 -                       }
 392 -               } else if (oldflags & EXT4_EOFBLOCKS_FL)
 393 -                       ext4_truncate(inode);
 394 -
 395 -               handle = ext4_journal_start(inode, EXT4_HT_INODE, 1);
 396 -               if (IS_ERR(handle)) {
 397 -                       err = PTR_ERR(handle);
 398 -                       goto flags_out;
 399 -               }
 400 -               if (IS_SYNC(inode))
 401 -                       ext4_handle_sync(handle);
 402 -               err = ext4_reserve_inode_write(handle, inode, &iloc);
 403 -               if (err)
 404 -                       goto flags_err;
 405 -
 406 -               for (i = 0, mask = 1; i < 32; i++, mask <<= 1) {
 407 -                       if (!(mask & EXT4_FL_USER_MODIFIABLE))
 408 -                               continue;
 409 -                       if (mask & flags)
 410 -                               ext4_set_inode_flag(inode, i);
 411 -                       else
 412 -                               ext4_clear_inode_flag(inode, i);
 413 -               }
 414 -
 415 -               ext4_set_inode_flags(inode);
 416 -               inode->i_ctime = ext4_current_time(inode);
 417 -
 418 -               err = ext4_mark_iloc_dirty(handle, inode, &iloc);
 419 -flags_err:
 420 -               ext4_journal_stop(handle);
 421 -               if (err)
 422 -                       goto flags_out;
 423 -
 424 -               if ((jflag ^ oldflags) & (EXT4_JOURNAL_DATA_FL))
 425 -                       err = ext4_change_inode_journal_flag(inode, jflag);
 426 -               if (err)
 427 -                       goto flags_out;
 428 -               if (migrate) {
 429 -                       if (flags & EXT4_EXTENTS_FL)
 430 -                               err = ext4_ext_migrate(inode);
 431 -                       else
 432 -                               err = ext4_ind_migrate(inode);
 433 -               }
 434 -
 435 -flags_out:
 436 +               err = ext4_ioctl_setflags(inode, flags);
 437                 mutex_unlock(&inode->i_mutex);
 438                 mnt_drop_write_file(filp);
 439                 return err;
 440 @@ -617,6 +778,62 @@ resizefs_out:
 441         }
 442         case EXT4_IOC_PRECACHE_EXTENTS:
 443                 return ext4_ext_precache(inode);
 444 +       case EXT4_IOC_FSGETXATTR:
 445 +       {
 446 +               struct fsxattr fa;
 447 +               unsigned int flags;
 448 +
 449 +               memset(&fa, 0, sizeof(struct fsxattr));
 450 +               ext4_get_inode_flags(ei);
 451 +               flags = ei->i_flags & EXT4_FL_USER_VISIBLE;
 452 +               fa.fsx_xflags = ext4_iflags_to_xflags(flags);
 453 +
 454 +               if (EXT4_HAS_RO_COMPAT_FEATURE(inode->i_sb,
 455 +                               EXT4_FEATURE_RO_COMPAT_PROJECT)) {
 456 +                       fa.fsx_projid = (__u32)from_kprojid(&init_user_ns,
 457 +                               EXT4_I(inode)->i_projid);
 458 +               }
 459 +
 460 +               if (copy_to_user((struct fsxattr __user *)arg,
 461 +                                &fa, sizeof(fa)))
 462 +                       return -EFAULT;
 463 +               return 0;
 464 +       }
 465 +       case EXT4_IOC_FSSETXATTR:
 466 +       {
 467 +               struct fsxattr fa;
 468 +               int err;
 469 +
 470 +               if (copy_from_user(&fa, (struct fsxattr __user *)arg,
 471 +                                  sizeof(fa)))
 472 +                       return -EFAULT;
 473 +
 474 +               /* Make sure caller has proper permission */
 475 +               if (!inode_owner_or_capable(inode))
 476 +                       return -EACCES;
 477 +
 478 +               err = mnt_want_write_file(filp);
 479 +               if (err)
 480 +                       return err;
 481 +
 482 +               flags = ext4_xflags_to_iflags(fa.fsx_xflags);
 483 +               flags = ext4_mask_flags(inode->i_mode, flags);
 484 +
 485 +               mutex_lock(&inode->i_mutex);
 486 +               flags = (ei->i_flags & ~EXT4_FL_XFLAG_VISIBLE) |
 487 +                        (flags & EXT4_FL_XFLAG_VISIBLE);
 488 +               err = ext4_ioctl_setflags(inode, flags);
 489 +               mutex_unlock(&inode->i_mutex);
 490 +               mnt_drop_write_file(filp);
 491 +               if (err)
 492 +                       return err;
 493 +
 494 +               err = ext4_ioctl_setproject(filp, fa.fsx_projid);
 495 +               if (err)
 496 +                       return err;
 497 +
 498 +               return 0;
 499 +       }
 500
 501         default:
 502                 return -ENOTTY;