1 Index: linux-stage/fs/ext4/ext4.h
2 ===================================================================
3 --- linux-stage.orig/fs/ext4/ext4.h
4 +++ linux-stage/fs/ext4/ext4.h
5 @@ -397,6 +397,13 @@ struct flex_groups {
6 #define EXT4_FL_USER_VISIBLE 0x304BDFFF /* User visible flags */
7 #define EXT4_FL_USER_MODIFIABLE 0x204380FF /* User modifiable flags */
9 +#define EXT4_FL_XFLAG_VISIBLE (EXT4_SYNC_FL | \
10 + EXT4_IMMUTABLE_FL | \
14 + EXT4_PROJINHERIT_FL)
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 @@ -622,6 +629,44 @@ enum {
20 #define EXT4_IOC_SWAP_BOOT _IO('f', 17)
21 #define EXT4_IOC_PRECACHE_EXTENTS _IO('f', 18)
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)
28 + * Structure for FS_IOC_FSGETXATTR and FS_IOC_FSSETXATTR.
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];
39 + * Flags for the fsx_xflags field
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) */
58 +#define EXT4_IOC_FSGETXATTR FS_IOC_FSGETXATTR
59 +#define EXT4_IOC_FSSETXATTR FS_IOC_FSSETXATTR
61 #if defined(__KERNEL__) && defined(CONFIG_COMPAT)
63 * ioctl commands in 32 bit emulation
64 @@ -2405,6 +2450,7 @@ extern int ext4_ind_remove_space(handle_
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);
71 extern int ext4_ext_migrate(struct inode *);
72 Index: linux-stage/fs/ext4/ioctl.c
73 ===================================================================
74 --- linux-stage.orig/fs/ext4/ioctl.c
75 +++ linux-stage/fs/ext4/ioctl.c
77 #include <linux/file.h>
78 #include <linux/uuid.h>
79 #include <asm/uaccess.h>
80 +#include <linux/quotaops.h>
81 #include "ext4_jbd2.h"
84 @@ -199,6 +200,260 @@ journal_err_out:
88 +static int ext4_ioctl_setflags(struct inode *inode,
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;
98 + /* Is it quota file? Do not allow user to mess with it */
99 + if (IS_NOQUOTA(inode))
102 + oldflags = ei->i_flags;
104 + /* The JOURNAL_DATA flag is modifiable only by root */
105 + jflag = flags & EXT4_JOURNAL_DATA_FL;
108 + * The IMMUTABLE and APPEND_ONLY flags can only be changed by
109 + * the relevant capability.
111 + * This test looks nicer. Thanks to Pauline Middelink
113 + if ((flags ^ oldflags) & (EXT4_APPEND_FL | EXT4_IMMUTABLE_FL)) {
114 + if (!capable(CAP_LINUX_IMMUTABLE))
119 + * The JOURNAL_DATA flag can only be changed by
120 + * the relevant capability.
122 + if ((jflag ^ oldflags) & (EXT4_JOURNAL_DATA_FL)) {
123 + if (!capable(CAP_SYS_RESOURCE))
126 + if ((flags ^ oldflags) & EXT4_EXTENTS_FL)
129 + if (flags & EXT4_EOFBLOCKS_FL) {
130 + /* we don't support adding EOFBLOCKS flag */
131 + if (!(oldflags & EXT4_EOFBLOCKS_FL)) {
135 + } else if (oldflags & EXT4_EOFBLOCKS_FL)
136 + ext4_truncate(inode);
138 + handle = ext4_journal_start(inode, EXT4_HT_INODE, 1);
139 + if (IS_ERR(handle)) {
140 + err = PTR_ERR(handle);
143 + if (IS_SYNC(inode))
144 + ext4_handle_sync(handle);
145 + err = ext4_reserve_inode_write(handle, inode, &iloc);
149 + for (i = 0, mask = 1; i < 32; i++, mask <<= 1) {
150 + if (!(mask & EXT4_FL_USER_MODIFIABLE))
153 + ext4_set_inode_flag(inode, i);
155 + ext4_clear_inode_flag(inode, i);
158 + ext4_set_inode_flags(inode);
159 + inode->i_ctime = ext4_current_time(inode);
161 + err = ext4_mark_iloc_dirty(handle, inode, &iloc);
163 + ext4_journal_stop(handle);
167 + if ((jflag ^ oldflags) & (EXT4_JOURNAL_DATA_FL)) {
169 + * Changes to the journaling mode can cause unsafe
170 + * changes to S_DAX if we are using the DAX mount option.
172 + if (test_opt(inode->i_sb, DAX)) {
176 + err = ext4_change_inode_journal_flag(inode, jflag);
181 + if (flags & EXT4_EXTENTS_FL)
182 + err = ext4_ext_migrate(inode);
184 + err = ext4_ind_migrate(inode);
192 +int __ext4_ioctl_setproject(struct inode *inode, __u32 projid)
194 + struct super_block *sb = inode->i_sb;
195 + struct ext4_inode_info *ei = EXT4_I(inode);
199 + struct ext4_iloc iloc;
200 + struct ext4_inode *raw_inode;
201 + struct dquot *transfer_to[EXT4_MAXQUOTAS] = { };
203 + if (!EXT4_HAS_RO_COMPAT_FEATURE(sb,
204 + EXT4_FEATURE_RO_COMPAT_PROJECT)) {
205 + BUG_ON(__kprojid_val(EXT4_I(inode)->i_projid)
206 + != EXT4_DEF_PROJID);
207 + if (projid != EXT4_DEF_PROJID)
208 + return -EOPNOTSUPP;
213 + if (EXT4_INODE_SIZE(sb) <= EXT4_GOOD_OLD_INODE_SIZE)
214 + return -EOPNOTSUPP;
216 + kprojid = make_kprojid(&init_user_ns, (projid_t)projid);
218 + if (projid_eq(kprojid, EXT4_I(inode)->i_projid))
222 + mutex_lock(&inode->i_mutex);
223 + /* Is it quota file? Do not allow user to mess with it */
224 + if (IS_NOQUOTA(inode))
227 + err = ext4_get_inode_loc(inode, &iloc);
231 + raw_inode = ext4_raw_inode(&iloc);
232 + if (!EXT4_FITS_IN_INODE(raw_inode, ei, i_projid)) {
239 + dquot_initialize(inode);
241 + handle = ext4_journal_start(inode, EXT4_HT_QUOTA,
242 + EXT4_QUOTA_INIT_BLOCKS(sb) +
243 + EXT4_QUOTA_DEL_BLOCKS(sb) + 3);
244 + if (IS_ERR(handle)) {
245 + err = PTR_ERR(handle);
249 + err = ext4_reserve_inode_write(handle, inode, &iloc);
253 + transfer_to[PRJQUOTA] = dqget(sb, make_kqid_projid(kprojid));
254 + if (transfer_to[PRJQUOTA]) {
255 + err = __dquot_transfer(inode, transfer_to);
256 + dqput(transfer_to[PRJQUOTA]);
261 + EXT4_I(inode)->i_projid = kprojid;
262 + inode->i_ctime = ext4_current_time(inode);
264 + rc = ext4_mark_iloc_dirty(handle, inode, &iloc);
268 + ext4_journal_stop(handle);
270 + mutex_unlock(&inode->i_mutex);
275 +EXPORT_SYMBOL(__ext4_ioctl_setproject);
277 +static int ext4_ioctl_setproject(struct file *filp, __u32 projid)
280 + struct inode *inode = file_inode(filp);
282 + err = mnt_want_write_file(filp);
286 + err = __ext4_ioctl_setproject(inode, projid);
288 + mnt_drop_write_file(filp);
292 +static int ext4_ioctl_setproject(struct file *filp, __u32 projid)
294 + if (projid != EXT4_DEF_PROJID)
295 + return -EOPNOTSUPP;
301 +/* Transfer internal flags to xflags */
302 +static inline __u32 ext4_iflags_to_xflags(unsigned long iflags)
306 + if (iflags & EXT4_SYNC_FL)
307 + xflags |= FS_XFLAG_SYNC;
308 + if (iflags & EXT4_IMMUTABLE_FL)
309 + xflags |= FS_XFLAG_IMMUTABLE;
310 + if (iflags & EXT4_APPEND_FL)
311 + xflags |= FS_XFLAG_APPEND;
312 + if (iflags & EXT4_NODUMP_FL)
313 + xflags |= FS_XFLAG_NODUMP;
314 + if (iflags & EXT4_NOATIME_FL)
315 + xflags |= FS_XFLAG_NOATIME;
316 + if (iflags & EXT4_PROJINHERIT_FL)
317 + xflags |= FS_XFLAG_PROJINHERIT;
321 +/* Transfer xflags flags to internal */
322 +static inline unsigned long ext4_xflags_to_iflags(__u32 xflags)
324 + unsigned long iflags = 0;
326 + if (xflags & FS_XFLAG_SYNC)
327 + iflags |= EXT4_SYNC_FL;
328 + if (xflags & FS_XFLAG_IMMUTABLE)
329 + iflags |= EXT4_IMMUTABLE_FL;
330 + if (xflags & FS_XFLAG_APPEND)
331 + iflags |= EXT4_APPEND_FL;
332 + if (xflags & FS_XFLAG_NODUMP)
333 + iflags |= EXT4_NODUMP_FL;
334 + if (xflags & FS_XFLAG_NOATIME)
335 + iflags |= EXT4_NOATIME_FL;
336 + if (xflags & FS_XFLAG_PROJINHERIT)
337 + iflags |= EXT4_PROJINHERIT_FL;
342 long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
344 struct inode *inode = file_inode(filp);
345 @@ -214,11 +469,7 @@ long ext4_ioctl(struct file *filp, unsig
346 flags = ei->i_flags & EXT4_FL_USER_VISIBLE;
347 return put_user(flags, (int __user *) arg);
348 case EXT4_IOC_SETFLAGS: {
349 - handle_t *handle = NULL;
350 - int err, migrate = 0;
351 - struct ext4_iloc iloc;
352 - unsigned int oldflags, mask, i;
353 - unsigned int jflag;
356 if (!inode_owner_or_capable(inode))
358 @@ -232,98 +483,8 @@ long ext4_ioctl(struct file *filp, unsig
360 flags = ext4_mask_flags(inode->i_mode, flags);
363 mutex_lock(&inode->i_mutex);
364 - /* Is it quota file? Do not allow user to mess with it */
365 - if (IS_NOQUOTA(inode))
368 - oldflags = ei->i_flags;
370 - /* The JOURNAL_DATA flag is modifiable only by root */
371 - jflag = flags & EXT4_JOURNAL_DATA_FL;
374 - * The IMMUTABLE and APPEND_ONLY flags can only be changed by
375 - * the relevant capability.
377 - * This test looks nicer. Thanks to Pauline Middelink
379 - if ((flags ^ oldflags) & (EXT4_APPEND_FL | EXT4_IMMUTABLE_FL)) {
380 - if (!capable(CAP_LINUX_IMMUTABLE))
385 - * The JOURNAL_DATA flag can only be changed by
386 - * the relevant capability.
388 - if ((jflag ^ oldflags) & (EXT4_JOURNAL_DATA_FL)) {
389 - if (!capable(CAP_SYS_RESOURCE))
392 - if ((flags ^ oldflags) & EXT4_EXTENTS_FL)
395 - if (flags & EXT4_EOFBLOCKS_FL) {
396 - /* we don't support adding EOFBLOCKS flag */
397 - if (!(oldflags & EXT4_EOFBLOCKS_FL)) {
401 - } else if (oldflags & EXT4_EOFBLOCKS_FL)
402 - ext4_truncate(inode);
404 - handle = ext4_journal_start(inode, EXT4_HT_INODE, 1);
405 - if (IS_ERR(handle)) {
406 - err = PTR_ERR(handle);
409 - if (IS_SYNC(inode))
410 - ext4_handle_sync(handle);
411 - err = ext4_reserve_inode_write(handle, inode, &iloc);
415 - for (i = 0, mask = 1; i < 32; i++, mask <<= 1) {
416 - if (!(mask & EXT4_FL_USER_MODIFIABLE))
419 - ext4_set_inode_flag(inode, i);
421 - ext4_clear_inode_flag(inode, i);
424 - ext4_set_inode_flags(inode);
425 - inode->i_ctime = ext4_current_time(inode);
427 - err = ext4_mark_iloc_dirty(handle, inode, &iloc);
429 - ext4_journal_stop(handle);
433 - if ((jflag ^ oldflags) & (EXT4_JOURNAL_DATA_FL)) {
435 - * Changes to the journaling mode can cause unsafe
436 - * changes to S_DAX if we are using the DAX mount option.
438 - if (test_opt(inode->i_sb, DAX)) {
442 - err = ext4_change_inode_journal_flag(inode, jflag);
447 - if (flags & EXT4_EXTENTS_FL)
448 - err = ext4_ext_migrate(inode);
450 - err = ext4_ind_migrate(inode);
454 + err = ext4_ioctl_setflags(inode, flags);
455 mutex_unlock(&inode->i_mutex);
456 mnt_drop_write_file(filp);
458 @@ -632,6 +793,62 @@ resizefs_out:
460 case EXT4_IOC_PRECACHE_EXTENTS:
461 return ext4_ext_precache(inode);
462 + case EXT4_IOC_FSGETXATTR:
465 + unsigned int flags;
467 + memset(&fa, 0, sizeof(struct fsxattr));
468 + ext4_get_inode_flags(ei);
469 + flags = ei->i_flags & EXT4_FL_USER_VISIBLE;
470 + fa.fsx_xflags = ext4_iflags_to_xflags(flags);
472 + if (EXT4_HAS_RO_COMPAT_FEATURE(inode->i_sb,
473 + EXT4_FEATURE_RO_COMPAT_PROJECT)) {
474 + fa.fsx_projid = (__u32)from_kprojid(&init_user_ns,
475 + EXT4_I(inode)->i_projid);
478 + if (copy_to_user((struct fsxattr __user *)arg,
483 + case EXT4_IOC_FSSETXATTR:
488 + if (copy_from_user(&fa, (struct fsxattr __user *)arg,
492 + /* Make sure caller has proper permission */
493 + if (!inode_owner_or_capable(inode))
496 + err = mnt_want_write_file(filp);
500 + flags = ext4_xflags_to_iflags(fa.fsx_xflags);
501 + flags = ext4_mask_flags(inode->i_mode, flags);
503 + mutex_lock(&inode->i_mutex);
504 + flags = (ei->i_flags & ~EXT4_FL_XFLAG_VISIBLE) |
505 + (flags & EXT4_FL_XFLAG_VISIBLE);
506 + err = ext4_ioctl_setflags(inode, flags);
507 + mutex_unlock(&inode->i_mutex);
508 + mnt_drop_write_file(filp);
512 + err = ext4_ioctl_setproject(filp, fa.fsx_projid);