The patch titled NFS: if ATTR_KILL_S*ID bits are set, then skip mode change has been removed from the -mm tree. Its filename was nfs-if-attr_kill_sid-bits-are-set-then-skip-mode-change.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: NFS: if ATTR_KILL_S*ID bits are set, then skip mode change From: Jeff Layton <jlayton@xxxxxxxxxx> If the ATTR_KILL_S*ID bits are set then any mode change is only for clearing the setuid/setgid bits. For NFS, skip the mode change and let the server handle it. Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx> Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx> Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx> Cc: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/nfs/inode.c | 4 ++++ 1 file changed, 4 insertions(+) diff -puN fs/nfs/inode.c~nfs-if-attr_kill_sid-bits-are-set-then-skip-mode-change fs/nfs/inode.c --- a/fs/nfs/inode.c~nfs-if-attr_kill_sid-bits-are-set-then-skip-mode-change +++ a/fs/nfs/inode.c @@ -357,6 +357,10 @@ nfs_setattr(struct dentry *dentry, struc nfs_inc_stats(inode, NFSIOS_VFSSETATTR); + /* skip mode change if it's just for clearing setuid/setgid */ + if (attr->ia_valid & (ATTR_KILL_SUID | ATTR_KILL_SGID)) + attr->ia_valid &= ~ATTR_MODE; + if (attr->ia_valid & ATTR_SIZE) { if (!S_ISREG(inode->i_mode) || attr->ia_size == i_size_read(inode)) attr->ia_valid &= ~ATTR_SIZE; _ Patches currently in -mm which might be from jlayton@xxxxxxxxxx are origin.patch git-cifs.patch unionfs-fix-unionfs_setattr-to-handle-attr_kill_sid.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