From mboxrd@z Thu Jan 1 00:00:00 1970 From: Valerie Aurora Subject: [PATCH 36/39] union-mount: Implement union-aware lchown() Date: Mon, 3 May 2010 16:12:35 -0700 Message-ID: <1272928358-20854-37-git-send-email-vaurora@redhat.com> References: <1272928358-20854-1-git-send-email-vaurora@redhat.com> Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig , Jan Blunck , Valerie Aurora To: Alexander Viro Return-path: In-Reply-To: <1272928358-20854-1-git-send-email-vaurora@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org --- fs/open.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/fs/open.c b/fs/open.c index 866041c..e9266e2 100644 --- a/fs/open.c +++ b/fs/open.c @@ -812,18 +812,35 @@ out: SYSCALL_DEFINE3(lchown, 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_lpath(filename, &path); + error = user_path_nd(AT_FDCWD, filename, 0, &nd, &path, &tmp); if (error) goto out; - error = mnt_want_write(path.mnt); + + if (IS_UNIONED_DIR(&nd.path)) + 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