From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932405Ab0FYTGp (ORCPT ); Fri, 25 Jun 2010 15:06:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42491 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932350Ab0FYTGj (ORCPT ); Fri, 25 Jun 2010 15:06:39 -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 35/38] union-mount: Implement union-aware lchown() Date: Fri, 25 Jun 2010 12:05:25 -0700 Message-Id: <1277492728-11446-36-git-send-email-vaurora@redhat.com> In-Reply-To: <1277492728-11446-1-git-send-email-vaurora@redhat.com> References: <1277492728-11446-1-git-send-email-vaurora@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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 336fe01..b021dcb 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_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