Don't stomp on old ia_valid when changing user/group.

Found by Andrew Morton <akpm@zip.com.au>

diff --git a/fs/open.c b/fs/open.c
index 58853a70da437ff7e828eee90e184d3f9bbc050f..304b575919d5bb0e48415d4d1ed08c3dc1b8924c 100644 (file)
--- a/fs/open.c
+++ b/fs/open.c
@@ -524,11 +524,11 @@ static int chown_common(struct dentry * dentry, uid_t user, gid_t group)
                goto out;
        newattrs.ia_valid =  ATTR_CTIME;
        if (user != (uid_t) -1) {
-               newattrs.ia_valid =  ATTR_UID;
+               newattrs.ia_valid |= ATTR_UID;
                newattrs.ia_uid = user;
        }
        if (group != (gid_t) -1) {
-               newattrs.ia_valid =  ATTR_GID;
+               newattrs.ia_valid |= ATTR_GID;
                newattrs.ia_gid = group;
        }
        if (!S_ISDIR(inode->i_mode))