1 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
2 index ce3b85f..29db502 100644
5 @@ -395,6 +395,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 @@ -620,6 +627,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 diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
65 index 70c66d3..276d33d 100644
69 #include <linux/mount.h>
70 #include <linux/file.h>
71 #include <asm/uaccess.h>
72 +#include <linux/quotaops.h>
73 #include "ext4_jbd2.h"
76 @@ -198,6 +199,242 @@ 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))
160 + err = ext4_change_inode_journal_flag(inode, jflag);
164 + if (flags & EXT4_EXTENTS_FL)
165 + err = ext4_ext_migrate(inode);
167 + err = ext4_ind_migrate(inode);
175 +static int ext4_ioctl_setproject(struct file *filp, __u32 projid)
177 + struct inode *inode = file_inode(filp);
178 + struct super_block *sb = inode->i_sb;
179 + struct ext4_inode_info *ei = EXT4_I(inode);
183 + struct ext4_iloc iloc;
184 + struct ext4_inode *raw_inode;
185 + struct dquot *transfer_to[EXT4_MAXQUOTAS] = { };
187 + if (!EXT4_HAS_RO_COMPAT_FEATURE(sb,
188 + EXT4_FEATURE_RO_COMPAT_PROJECT)) {
189 + BUG_ON(__kprojid_val(EXT4_I(inode)->i_projid)
190 + != EXT4_DEF_PROJID);
191 + if (projid != EXT4_DEF_PROJID)
192 + return -EOPNOTSUPP;
197 + if (EXT4_INODE_SIZE(sb) <= EXT4_GOOD_OLD_INODE_SIZE)
198 + return -EOPNOTSUPP;
200 + kprojid = make_kprojid(&init_user_ns, (projid_t)projid);
202 + if (projid_eq(kprojid, EXT4_I(inode)->i_projid))
205 + err = mnt_want_write_file(filp);
210 + mutex_lock(&inode->i_mutex);
211 + /* Is it quota file? Do not allow user to mess with it */
212 + if (IS_NOQUOTA(inode))
215 + err = ext4_get_inode_loc(inode, &iloc);
219 + raw_inode = ext4_raw_inode(&iloc);
220 + if (!EXT4_FITS_IN_INODE(raw_inode, ei, i_projid)) {
227 + dquot_initialize(inode);
229 + handle = ext4_journal_start(inode, EXT4_HT_QUOTA,
230 + EXT4_QUOTA_INIT_BLOCKS(sb) +
231 + EXT4_QUOTA_DEL_BLOCKS(sb) + 3);
232 + if (IS_ERR(handle)) {
233 + err = PTR_ERR(handle);
237 + err = ext4_reserve_inode_write(handle, inode, &iloc);
241 + transfer_to[PRJQUOTA] = dqget(sb, make_kqid_projid(kprojid));
242 + if (transfer_to[PRJQUOTA]) {
243 + err = __dquot_transfer(inode, transfer_to);
244 + dqput(transfer_to[PRJQUOTA]);
249 + EXT4_I(inode)->i_projid = kprojid;
250 + inode->i_ctime = ext4_current_time(inode);
252 + rc = ext4_mark_iloc_dirty(handle, inode, &iloc);
256 + ext4_journal_stop(handle);
258 + mutex_unlock(&inode->i_mutex);
259 + mnt_drop_write_file(filp);
266 +static int ext4_ioctl_setproject(struct file *filp, __u32 projid)
268 + if (projid != EXT4_DEF_PROJID)
269 + return -EOPNOTSUPP;
275 +/* Transfer internal flags to xflags */
276 +static inline __u32 ext4_iflags_to_xflags(unsigned long iflags)
280 + if (iflags & EXT4_SYNC_FL)
281 + xflags |= FS_XFLAG_SYNC;
282 + if (iflags & EXT4_IMMUTABLE_FL)
283 + xflags |= FS_XFLAG_IMMUTABLE;
284 + if (iflags & EXT4_APPEND_FL)
285 + xflags |= FS_XFLAG_APPEND;
286 + if (iflags & EXT4_NODUMP_FL)
287 + xflags |= FS_XFLAG_NODUMP;
288 + if (iflags & EXT4_NOATIME_FL)
289 + xflags |= FS_XFLAG_NOATIME;
290 + if (iflags & EXT4_PROJINHERIT_FL)
291 + xflags |= FS_XFLAG_PROJINHERIT;
295 +/* Transfer xflags flags to internal */
296 +static inline unsigned long ext4_xflags_to_iflags(__u32 xflags)
298 + unsigned long iflags = 0;
300 + if (xflags & FS_XFLAG_SYNC)
301 + iflags |= EXT4_SYNC_FL;
302 + if (xflags & FS_XFLAG_IMMUTABLE)
303 + iflags |= EXT4_IMMUTABLE_FL;
304 + if (xflags & FS_XFLAG_APPEND)
305 + iflags |= EXT4_APPEND_FL;
306 + if (xflags & FS_XFLAG_NODUMP)
307 + iflags |= EXT4_NODUMP_FL;
308 + if (xflags & FS_XFLAG_NOATIME)
309 + iflags |= EXT4_NOATIME_FL;
310 + if (xflags & FS_XFLAG_PROJINHERIT)
311 + iflags |= EXT4_PROJINHERIT_FL;
316 long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
318 struct inode *inode = file_inode(filp);
319 @@ -213,11 +502,7 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
320 flags = ei->i_flags & EXT4_FL_USER_VISIBLE;
321 return put_user(flags, (int __user *) arg);
322 case EXT4_IOC_SETFLAGS: {
323 - handle_t *handle = NULL;
324 - int err, migrate = 0;
325 - struct ext4_iloc iloc;
326 - unsigned int oldflags, mask, i;
327 - unsigned int jflag;
330 if (!inode_owner_or_capable(inode))
332 @@ -231,89 +516,8 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
334 flags = ext4_mask_flags(inode->i_mode, flags);
337 mutex_lock(&inode->i_mutex);
338 - /* Is it quota file? Do not allow user to mess with it */
339 - if (IS_NOQUOTA(inode))
342 - oldflags = ei->i_flags;
344 - /* The JOURNAL_DATA flag is modifiable only by root */
345 - jflag = flags & EXT4_JOURNAL_DATA_FL;
348 - * The IMMUTABLE and APPEND_ONLY flags can only be changed by
349 - * the relevant capability.
351 - * This test looks nicer. Thanks to Pauline Middelink
353 - if ((flags ^ oldflags) & (EXT4_APPEND_FL | EXT4_IMMUTABLE_FL)) {
354 - if (!capable(CAP_LINUX_IMMUTABLE))
359 - * The JOURNAL_DATA flag can only be changed by
360 - * the relevant capability.
362 - if ((jflag ^ oldflags) & (EXT4_JOURNAL_DATA_FL)) {
363 - if (!capable(CAP_SYS_RESOURCE))
366 - if ((flags ^ oldflags) & EXT4_EXTENTS_FL)
369 - if (flags & EXT4_EOFBLOCKS_FL) {
370 - /* we don't support adding EOFBLOCKS flag */
371 - if (!(oldflags & EXT4_EOFBLOCKS_FL)) {
375 - } else if (oldflags & EXT4_EOFBLOCKS_FL)
376 - ext4_truncate(inode);
378 - handle = ext4_journal_start(inode, EXT4_HT_INODE, 1);
379 - if (IS_ERR(handle)) {
380 - err = PTR_ERR(handle);
383 - if (IS_SYNC(inode))
384 - ext4_handle_sync(handle);
385 - err = ext4_reserve_inode_write(handle, inode, &iloc);
389 - for (i = 0, mask = 1; i < 32; i++, mask <<= 1) {
390 - if (!(mask & EXT4_FL_USER_MODIFIABLE))
393 - ext4_set_inode_flag(inode, i);
395 - ext4_clear_inode_flag(inode, i);
398 - ext4_set_inode_flags(inode);
399 - inode->i_ctime = ext4_current_time(inode);
401 - err = ext4_mark_iloc_dirty(handle, inode, &iloc);
403 - ext4_journal_stop(handle);
407 - if ((jflag ^ oldflags) & (EXT4_JOURNAL_DATA_FL))
408 - err = ext4_change_inode_journal_flag(inode, jflag);
412 - if (flags & EXT4_EXTENTS_FL)
413 - err = ext4_ext_migrate(inode);
415 - err = ext4_ind_migrate(inode);
419 + err = ext4_ioctl_setflags(inode, flags);
420 mutex_unlock(&inode->i_mutex);
421 mnt_drop_write_file(filp);
423 @@ -622,6 +826,62 @@ resizefs_out:
425 case EXT4_IOC_PRECACHE_EXTENTS:
426 return ext4_ext_precache(inode);
427 + case EXT4_IOC_FSGETXATTR:
430 + unsigned int flags;
432 + memset(&fa, 0, sizeof(struct fsxattr));
433 + ext4_get_inode_flags(ei);
434 + flags = ei->i_flags & EXT4_FL_USER_VISIBLE;
435 + fa.fsx_xflags = ext4_iflags_to_xflags(flags);
437 + if (EXT4_HAS_RO_COMPAT_FEATURE(inode->i_sb,
438 + EXT4_FEATURE_RO_COMPAT_PROJECT)) {
439 + fa.fsx_projid = (__u32)from_kprojid(&init_user_ns,
440 + EXT4_I(inode)->i_projid);
443 + if (copy_to_user((struct fsxattr __user *)arg,
448 + case EXT4_IOC_FSSETXATTR:
453 + if (copy_from_user(&fa, (struct fsxattr __user *)arg,
457 + /* Make sure caller has proper permission */
458 + if (!inode_owner_or_capable(inode))
461 + err = mnt_want_write_file(filp);
465 + flags = ext4_xflags_to_iflags(fa.fsx_xflags);
466 + flags = ext4_mask_flags(inode->i_mode, flags);
468 + mutex_lock(&inode->i_mutex);
469 + flags = (ei->i_flags & ~EXT4_FL_XFLAG_VISIBLE) |
470 + (flags & EXT4_FL_XFLAG_VISIBLE);
471 + err = ext4_ioctl_setflags(inode, flags);
472 + mutex_unlock(&inode->i_mutex);
473 + mnt_drop_write_file(filp);
477 + err = ext4_ioctl_setproject(filp, fa.fsx_projid);