Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932321Ab0FOSm7 (ORCPT ); Tue, 15 Jun 2010 14:42:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29783 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932272Ab0FOSmm (ORCPT ); Tue, 15 Jun 2010 14:42:42 -0400 From: Valerie Aurora To: Alexander Viro Cc: Miklos Szeredi , Jan Blunck , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Valerie Aurora Subject: [PATCH 32/38] union-mount: Implement union-aware chown() Date: Tue, 15 Jun 2010 11:40:02 -0700 Message-Id: <1276627208-17242-33-git-send-email-vaurora@redhat.com> In-Reply-To: <1276627208-17242-1-git-send-email-vaurora@redhat.com> References: <1276627208-17242-1-git-send-email-vaurora@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1348 Lines: 55 --- fs/open.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/fs/open.c b/fs/open.c index 7f7958e..68c97dd 100644 --- a/fs/open.c +++ b/fs/open.c @@ -718,18 +718,35 @@ static int chown_common(struct path *path, uid_t user, gid_t group) SYSCALL_DEFINE3(chown, const char __user *, filename, uid_t, user, gid_t, group) { struct path path; + struct nameidata nd; + struct vfsmount *mnt; + char *tmp; int error; - error = user_path(filename, &path); + error = user_path_nd(AT_FDCWD, filename, LOOKUP_FOLLOW, + &nd, &path, &tmp); if (error) goto out; - error = mnt_want_write(path.mnt); + + if (IS_DIR_UNIONED(nd.path.dentry)) + mnt = nd.path.mnt; + else + mnt = path.mnt; + + error = mnt_want_write(mnt); if (error) goto out_release; + + error = union_copyup(&nd, &path); + if (error) + goto out_drop_write; error = chown_common(&path, user, group); - mnt_drop_write(path.mnt); +out_drop_write: + mnt_drop_write(mnt); out_release: path_put(&path); + path_put(&nd.path); + putname(tmp); out: return error; } -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/