add-EXT4_JOURNAL_DATA_FL-and-EXT4_EXTENTS_FL-to-modifiable-mask

   1 ext4: add EXT4_JOURNAL_DATA_FL and EXT4_EXTENTS_FL to modifiable mask
   2
   3 From: Jan Kara <jack@suse.cz>
   4
   5 Add EXT4_JOURNAL_DATA_FL and EXT4_EXTENTS_FL to EXT4_FL_USER_MODIFIABLE
   6 to recognize that they are modifiable by userspace. So far we got away
   7 without having them there because ext4_ioctl_setflags() treats them in a
   8 special way. But it was really confusing like that.
   9
  10 Signed-off-by: Jan Kara <jack@suse.cz>
  11 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  12 ---
  13  fs/ext4/ext4.h  | 2 +-
  14  fs/ext4/ioctl.c | 3 +++
  15  2 files changed, 4 insertions(+), 1 deletion(-)
  16
  17 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
  18 index ea31931386ec..0814c9570bf1 100644
  19 --- a/fs/ext4/ext4.h
  20 +++ b/fs/ext4/ext4.h
  21 @@ -393,7 +393,7 @@ struct flex_groups {
  22  #define EXT4_RESERVED_FL               0x80000000 /* reserved for ext4 lib */
  23
  24  #define EXT4_FL_USER_VISIBLE           0x304BDFFF /* User visible flags */
  25 -#define EXT4_FL_USER_MODIFIABLE                0x204380FF /* User modifiable flags */
  26 +#define EXT4_FL_USER_MODIFIABLE                0x204BC0FF /* User modifiable flags */
  27
  28  #define EXT4_FL_XFLAG_VISIBLE          (EXT4_SYNC_FL | \
  29                                          EXT4_IMMUTABLE_FL | \
  30 diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
  31 index 1bb7df5e4536..e9433c155454 100644
  32 --- a/fs/ext4/ioctl.c
  33 +++ b/fs/ext4/ioctl.c
  34 @@ -267,6 +267,9 @@ static int ext4_ioctl_setflags(struct inode *inode,
  35         for (i = 0, mask = 1; i < 32; i++, mask <<= 1) {
  36                 if (!(mask & EXT4_FL_USER_MODIFIABLE))
  37                         continue;
  38 +               /* These flags get special treatment later */
  39 +               if (mask == EXT4_JOURNAL_DATA_FL || mask == EXT4_EXTENTS_FL)
  40 +                       continue;
  41                 if (mask & flags)
  42                         ext4_set_inode_flag(inode, i);
  43                 else
  44 --
  45 2.6.6
  46
  47