The patch titled vfs: make security_inode_setattr() calling consistent has been removed from the -mm tree. Its filename was vfs-make-security_inode_setattr-calling-consistent.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: vfs: make security_inode_setattr() calling consistent From: Miklos Szeredi <mszeredi@xxxxxxx> Call security_inode_setattr() consistently before inode_change_ok(). It doesn't make sense to try to "optimize" the i_op->setattr == NULL case, as most filesystem do define their own setattr function. Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxx> Acked-by: Stephen Smalley <sds@xxxxxxxxxxxxx> Acked-by: James Morris <jmorris@xxxxxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/attr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff -puN fs/attr.c~vfs-make-security_inode_setattr-calling-consistent fs/attr.c --- a/fs/attr.c~vfs-make-security_inode_setattr-calling-consistent +++ a/fs/attr.c @@ -159,17 +159,17 @@ int notify_change(struct dentry * dentry if (!(attr->ia_valid & ~(ATTR_KILL_SUID | ATTR_KILL_SGID))) return 0; + error = security_inode_setattr(dentry, attr); + if (error) + return error; + if (ia_valid & ATTR_SIZE) down_write(&dentry->d_inode->i_alloc_sem); if (inode->i_op && inode->i_op->setattr) { - error = security_inode_setattr(dentry, attr); - if (!error) - error = inode->i_op->setattr(dentry, attr); + error = inode->i_op->setattr(dentry, attr); } else { error = inode_change_ok(inode, attr); - if (!error) - error = security_inode_setattr(dentry, attr); if (!error) { if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) || (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) _ Patches currently in -mm which might be from mszeredi@xxxxxxx are vfs-fix-vfs_rename_dir-for-fs_rename_does_d_move-filesystems.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html