Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fa43a81 authored by Duane Griffin's avatar Duane Griffin Committed by Theodore Ts'o
Browse files

ext4: don't inherit inappropriate inode flags from parent 

At present INDEX and EXTENTS are the only flags that new ext4 inodes do
NOT inherit from their parent.  In addition prevent the flags DIRTY,
ECOMPR, IMAGIC, TOPDIR, HUGE_FILE and EXT_MIGRATE from being inherited. 
List inheritable flags explicitly to prevent future flags from
accidentally being inherited.

This fixes the TOPDIR flag inheritance bug reported at
http://bugzilla.kernel.org/show_bug.cgi?id=9866

.

Signed-off-by: default avatarDuane Griffin <duaneg@dghda.com>
Acked-by: default avatarAndreas Dilger <adilger@sun.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 705895b6

fs/ext4/ext4.h

+7 −0
Original line number Diff line number Diff line
@@ -239,6 +239,13 @@ struct flex_groups { 
#define EXT4_FL_USER_VISIBLE		0x000BDFFF /* User visible flags */

#define EXT4_FL_USER_MODIFIABLE		0x000B80FF /* User modifiable flags */



/* Flags that should be inherited by new inodes from their parent. */

#define EXT4_FL_INHERITED (EXT4_SECRM_FL | EXT4_UNRM_FL | EXT4_COMPR_FL |\

			   EXT4_SYNC_FL | EXT4_IMMUTABLE_FL | EXT4_APPEND_FL |\

			   EXT4_NODUMP_FL | EXT4_NOATIME_FL |\

			   EXT4_NOCOMPR_FL | EXT4_JOURNAL_DATA_FL |\

			   EXT4_NOTAIL_FL | EXT4_DIRSYNC_FL)



/*

 * Inode dynamic state flags

 */

fs/ext4/ialloc.c

+1 −1
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@ got: 
	 * newly created directory and file only if -o extent mount option is

	 * specified

	 */

	ei->i_flags = EXT4_I(dir)->i_flags & ~(EXT4_INDEX_FL|EXT4_EXTENTS_FL);

	ei->i_flags = EXT4_I(dir)->i_flags & EXT4_FL_INHERITED;

	if (S_ISLNK(mode))

		ei->i_flags &= ~(EXT4_IMMUTABLE_FL|EXT4_APPEND_FL);

	/* dirsync only applies to directories */