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 Index: linux-stage/fs/ext4/ioctl.c
65 ===================================================================
66 --- linux-stage.orig/fs/ext4/ioctl.c
67 +++ linux-stage/fs/ext4/ioctl.c
69 #include <linux/file.h>
70 #include <linux/uuid.h>
71 #include <asm/uaccess.h>
72 +#include <linux/quotaops.h>
73 #include "ext4_jbd2.h"
76 @@ -199,6 +200,251 @@ journal_err_out:
80 +static int ext4_ioctl_setflags(struct inode *inode,
83 + struct ext4_inode_info *ei = EXT4_I(inode);
84 + handle_t *handle = NULL;
85 + int err = EPERM, migrate = 0;
86 + struct ext4_iloc iloc;
87 + unsigned int oldflags, mask, i;
90 + /* Is it quota file? Do not allow user to mess with it */
91 + if (IS_NOQUOTA(inode))
94 + oldflags = ei->i_flags;
96 + /* The JOURNAL_DATA flag is modifiable only by root */
97 + jflag = flags & EXT4_JOURNAL_DATA_FL;
100 + * The IMMUTABLE and APPEND_ONLY flags can only be changed by
101 + * the relevant capability.
103 + * This test looks nicer. Thanks to Pauline Middelink
105 + if ((flags ^ oldflags) & (EXT4_APPEND_FL | EXT4_IMMUTABLE_FL)) {
106 + if (!capable(CAP_LINUX_IMMUTABLE))
111 + * The JOURNAL_DATA flag can only be changed by
112 + * the relevant capability.
114 + if ((jflag ^ oldflags) & (EXT4_JOURNAL_DATA_FL)) {
115 + if (!capable(CAP_SYS_RESOURCE))
118 + if ((flags ^ oldflags) & EXT4_EXTENTS_FL)
121 + if (flags & EXT4_EOFBLOCKS_FL) {
122 + /* we don't support adding EOFBLOCKS flag */
123 + if (!(oldflags & EXT4_EOFBLOCKS_FL)) {
127 + } else if (oldflags & EXT4_EOFBLOCKS_FL)
128 + ext4_truncate(inode);
130 + handle = ext4_journal_start(inode, EXT4_HT_INODE, 1);
131 + if (IS_ERR(handle)) {
132 + err = PTR_ERR(handle);
135 + if (IS_SYNC(inode))
136 + ext4_handle_sync(handle);
137 + err = ext4_reserve_inode_write(handle, inode, &iloc);
141 + for (i = 0, mask = 1; i < 32; i++, mask <<= 1) {
142 + if (!(mask & EXT4_FL_USER_MODIFIABLE))
145 + ext4_set_inode_flag(inode, i);
147 + ext4_clear_inode_flag(inode, i);
150 + ext4_set_inode_flags(inode);
151 + inode->i_ctime = ext4_current_time(inode);
153 + err = ext4_mark_iloc_dirty(handle, inode, &iloc);
155 + ext4_journal_stop(handle);
159 + if ((jflag ^ oldflags) & (EXT4_JOURNAL_DATA_FL)) {
161 + * Changes to the journaling mode can cause unsafe
162 + * changes to S_DAX if we are using the DAX mount option.
164 + if (test_opt(inode->i_sb, DAX)) {
168 + err = ext4_change_inode_journal_flag(inode, jflag);
173 + if (flags & EXT4_EXTENTS_FL)
174 + err = ext4_ext_migrate(inode);
176 + err = ext4_ind_migrate(inode);
184 +static int ext4_ioctl_setproject(struct file *filp, __u32 projid)
186 + struct inode *inode = file_inode(filp);
187 + struct super_block *sb = inode->i_sb;
188 + struct ext4_inode_info *ei = EXT4_I(inode);
192 + struct ext4_iloc iloc;
193 + struct ext4_inode *raw_inode;
194 + struct dquot *transfer_to[EXT4_MAXQUOTAS] = { };
196 + if (!EXT4_HAS_RO_COMPAT_FEATURE(sb,
197 + EXT4_FEATURE_RO_COMPAT_PROJECT)) {
198 + BUG_ON(__kprojid_val(EXT4_I(inode)->i_projid)
199 + != EXT4_DEF_PROJID);
200 + if (projid != EXT4_DEF_PROJID)
201 + return -EOPNOTSUPP;
206 + if (EXT4_INODE_SIZE(sb) <= EXT4_GOOD_OLD_INODE_SIZE)
207 + return -EOPNOTSUPP;
209 + kprojid = make_kprojid(&init_user_ns, (projid_t)projid);
211 + if (projid_eq(kprojid, EXT4_I(inode)->i_projid))
214 + err = mnt_want_write_file(filp);
219 + mutex_lock(&inode->i_mutex);
220 + /* Is it quota file? Do not allow user to mess with it */
221 + if (IS_NOQUOTA(inode))
224 + err = ext4_get_inode_loc(inode, &iloc);
228 + raw_inode = ext4_raw_inode(&iloc);
229 + if (!EXT4_FITS_IN_INODE(raw_inode, ei, i_projid)) {
236 + dquot_initialize(inode);
238 + handle = ext4_journal_start(inode, EXT4_HT_QUOTA,
239 + EXT4_QUOTA_INIT_BLOCKS(sb) +
240 + EXT4_QUOTA_DEL_BLOCKS(sb) + 3);
241 + if (IS_ERR(handle)) {
242 + err = PTR_ERR(handle);
246 + err = ext4_reserve_inode_write(handle, inode, &iloc);
250 + transfer_to[PRJQUOTA] = dqget(sb, make_kqid_projid(kprojid));
251 + if (transfer_to[PRJQUOTA]) {
252 + err = __dquot_transfer(inode, transfer_to);
253 + dqput(transfer_to[PRJQUOTA]);
258 + EXT4_I(inode)->i_projid = kprojid;
259 + inode->i_ctime = ext4_current_time(inode);
261 + rc = ext4_mark_iloc_dirty(handle, inode, &iloc);
265 + ext4_journal_stop(handle);
267 + mutex_unlock(&inode->i_mutex);
268 + mnt_drop_write_file(filp);
275 +static int ext4_ioctl_setproject(struct file *filp, __u32 projid)
277 + if (projid != EXT4_DEF_PROJID)
278 + return -EOPNOTSUPP;
284 +/* Transfer internal flags to xflags */
285 +static inline __u32 ext4_iflags_to_xflags(unsigned long iflags)
289 + if (iflags & EXT4_SYNC_FL)
290 + xflags |= FS_XFLAG_SYNC;
291 + if (iflags & EXT4_IMMUTABLE_FL)
292 + xflags |= FS_XFLAG_IMMUTABLE;
293 + if (iflags & EXT4_APPEND_FL)
294 + xflags |= FS_XFLAG_APPEND;
295 + if (iflags & EXT4_NODUMP_FL)
296 + xflags |= FS_XFLAG_NODUMP;
297 + if (iflags & EXT4_NOATIME_FL)
298 + xflags |= FS_XFLAG_NOATIME;
299 + if (iflags & EXT4_PROJINHERIT_FL)
300 + xflags |= FS_XFLAG_PROJINHERIT;
304 +/* Transfer xflags flags to internal */
305 +static inline unsigned long ext4_xflags_to_iflags(__u32 xflags)
307 + unsigned long iflags = 0;
309 + if (xflags & FS_XFLAG_SYNC)
310 + iflags |= EXT4_SYNC_FL;
311 + if (xflags & FS_XFLAG_IMMUTABLE)
312 + iflags |= EXT4_IMMUTABLE_FL;
313 + if (xflags & FS_XFLAG_APPEND)
314 + iflags |= EXT4_APPEND_FL;
315 + if (xflags & FS_XFLAG_NODUMP)
316 + iflags |= EXT4_NODUMP_FL;
317 + if (xflags & FS_XFLAG_NOATIME)
318 + iflags |= EXT4_NOATIME_FL;
319 + if (xflags & FS_XFLAG_PROJINHERIT)
320 + iflags |= EXT4_PROJINHERIT_FL;
325 long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
327 struct inode *inode = file_inode(filp);
328 @@ -214,11 +512,7 @@ long ext4_ioctl(struct file *filp, unsig
329 flags = ei->i_flags & EXT4_FL_USER_VISIBLE;
330 return put_user(flags, (int __user *) arg);
331 case EXT4_IOC_SETFLAGS: {
332 - handle_t *handle = NULL;
333 - int err, migrate = 0;
334 - struct ext4_iloc iloc;
335 - unsigned int oldflags, mask, i;
336 - unsigned int jflag;
339 if (!inode_owner_or_capable(inode))
341 @@ -232,98 +526,8 @@ long ext4_ioctl(struct file *filp, unsig
343 flags = ext4_mask_flags(inode->i_mode, flags);
346 mutex_lock(&inode->i_mutex);
347 - /* Is it quota file? Do not allow user to mess with it */
348 - if (IS_NOQUOTA(inode))
351 - oldflags = ei->i_flags;
353 - /* The JOURNAL_DATA flag is modifiable only by root */
354 - jflag = flags & EXT4_JOURNAL_DATA_FL;
357 - * The IMMUTABLE and APPEND_ONLY flags can only be changed by
358 - * the relevant capability.
360 - * This test looks nicer. Thanks to Pauline Middelink
362 - if ((flags ^ oldflags) & (EXT4_APPEND_FL | EXT4_IMMUTABLE_FL)) {
363 - if (!capable(CAP_LINUX_IMMUTABLE))
368 - * The JOURNAL_DATA flag can only be changed by
369 - * the relevant capability.
371 - if ((jflag ^ oldflags) & (EXT4_JOURNAL_DATA_FL)) {
372 - if (!capable(CAP_SYS_RESOURCE))
375 - if ((flags ^ oldflags) & EXT4_EXTENTS_FL)
378 - if (flags & EXT4_EOFBLOCKS_FL) {
379 - /* we don't support adding EOFBLOCKS flag */
380 - if (!(oldflags & EXT4_EOFBLOCKS_FL)) {
384 - } else if (oldflags & EXT4_EOFBLOCKS_FL)
385 - ext4_truncate(inode);
387 - handle = ext4_journal_start(inode, EXT4_HT_INODE, 1);
388 - if (IS_ERR(handle)) {
389 - err = PTR_ERR(handle);
392 - if (IS_SYNC(inode))
393 - ext4_handle_sync(handle);
394 - err = ext4_reserve_inode_write(handle, inode, &iloc);
398 - for (i = 0, mask = 1; i < 32; i++, mask <<= 1) {
399 - if (!(mask & EXT4_FL_USER_MODIFIABLE))
402 - ext4_set_inode_flag(inode, i);
404 - ext4_clear_inode_flag(inode, i);
407 - ext4_set_inode_flags(inode);
408 - inode->i_ctime = ext4_current_time(inode);
410 - err = ext4_mark_iloc_dirty(handle, inode, &iloc);
412 - ext4_journal_stop(handle);
416 - if ((jflag ^ oldflags) & (EXT4_JOURNAL_DATA_FL)) {
418 - * Changes to the journaling mode can cause unsafe
419 - * changes to S_DAX if we are using the DAX mount option.
421 - if (test_opt(inode->i_sb, DAX)) {
425 - err = ext4_change_inode_journal_flag(inode, jflag);
430 - if (flags & EXT4_EXTENTS_FL)
431 - err = ext4_ext_migrate(inode);
433 - err = ext4_ind_migrate(inode);
437 + err = ext4_ioctl_setflags(inode, flags);
438 mutex_unlock(&inode->i_mutex);
439 mnt_drop_write_file(filp);
441 @@ -632,6 +836,62 @@ resizefs_out:
443 case EXT4_IOC_PRECACHE_EXTENTS:
444 return ext4_ext_precache(inode);
445 + case EXT4_IOC_FSGETXATTR:
448 + unsigned int flags;
450 + memset(&fa, 0, sizeof(struct fsxattr));
451 + ext4_get_inode_flags(ei);
452 + flags = ei->i_flags & EXT4_FL_USER_VISIBLE;
453 + fa.fsx_xflags = ext4_iflags_to_xflags(flags);
455 + if (EXT4_HAS_RO_COMPAT_FEATURE(inode->i_sb,
456 + EXT4_FEATURE_RO_COMPAT_PROJECT)) {
457 + fa.fsx_projid = (__u32)from_kprojid(&init_user_ns,
458 + EXT4_I(inode)->i_projid);
461 + if (copy_to_user((struct fsxattr __user *)arg,
466 + case EXT4_IOC_FSSETXATTR:
471 + if (copy_from_user(&fa, (struct fsxattr __user *)arg,
475 + /* Make sure caller has proper permission */
476 + if (!inode_owner_or_capable(inode))
479 + err = mnt_want_write_file(filp);
483 + flags = ext4_xflags_to_iflags(fa.fsx_xflags);
484 + flags = ext4_mask_flags(inode->i_mode, flags);
486 + mutex_lock(&inode->i_mutex);
487 + flags = (ei->i_flags & ~EXT4_FL_XFLAG_VISIBLE) |
488 + (flags & EXT4_FL_XFLAG_VISIBLE);
489 + err = ext4_ioctl_setflags(inode, flags);
490 + mutex_unlock(&inode->i_mutex);
491 + mnt_drop_write_file(filp);
495 + err = ext4_ioctl_setproject(filp, fa.fsx_projid);