2008-06-05 05:36:43

by Andrew Morton

[permalink] [raw]
Subject: - ext2-dont-inherit-inappropriate-inode-flags-from-parent.patch removed from -mm tree

The patch titled
ext2: don't inherit inappropriate inode flags from parent
has been removed from the -mm tree. Its filename was

This patch was dropped because an updated version will be merged

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

Subject: ext2: don't inherit inappropriate inode flags from parent
From: "Duane Griffin" <[email protected]>

Fix the TOPDIR flag inheritance bug reported at

Some file attributes have sticky behaviour in ext2/3 whereas I believe
it should not. Namely, a directory marked with chattr +T serves "to be
the top of directory hierarchies for the purposes of the Orlov block
allocator", as the manpage says.

It seems wrong that subdirectories stickily inherit the +T flag: they
are obviously not top-level! Even files get the T attribute this way,
even though the chattr manpages only documents it for directories.

Also prevent inheritance of other flags that Andreas Dilger identified as
inappropriate to inherit

At present BTREE is the only flag that new ext2 inodes do NOT inherit from
their parent. In addition prevent the flags DIRTY, ECOMPR, INDEX, IMAGIC
and TOPDIR from being inherited.

Signed-off-by: Duane Griffin <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>

fs/ext2/ialloc.c | 2 +-
include/linux/ext2_fs.h | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)

diff -puN fs/ext2/ialloc.c~ext2-dont-inherit-inappropriate-inode-flags-from-parent fs/ext2/ialloc.c
--- a/fs/ext2/ialloc.c~ext2-dont-inherit-inappropriate-inode-flags-from-parent
+++ a/fs/ext2/ialloc.c
@@ -565,7 +565,7 @@ got:
inode->i_blocks = 0;
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
memset(ei->i_data, 0, sizeof(ei->i_data));
- ei->i_flags = EXT2_I(dir)->i_flags & ~EXT2_BTREE_FL;
+ ei->i_flags = EXT2_I(dir)->i_flags & EXT2_FL_INHERITED;
if (S_ISLNK(mode))
ei->i_flags &= ~(EXT2_IMMUTABLE_FL|EXT2_APPEND_FL);
/* dirsync is only applied to directories */
diff -puN include/linux/ext2_fs.h~ext2-dont-inherit-inappropriate-inode-flags-from-parent include/linux/ext2_fs.h
--- a/include/linux/ext2_fs.h~ext2-dont-inherit-inappropriate-inode-flags-from-parent
+++ a/include/linux/ext2_fs.h
@@ -194,6 +194,10 @@ struct ext2_group_desc
#define EXT2_FL_USER_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
#define EXT2_FL_USER_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */

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

Patches currently in -mm which might be from [email protected] are