From mboxrd@z Thu Jan 1 00:00:00 1970 From: Valerie Aurora Subject: [PATCH 38/39] union-mount: Implement union-aware setxattr() Date: Mon, 3 May 2010 16:12:37 -0700 Message-ID: <1272928358-20854-39-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: Received: from mx1.redhat.com ([209.132.183.28]:18083 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932399Ab0ECXOP (ORCPT ); Mon, 3 May 2010 19:14:15 -0400 In-Reply-To: <1272928358-20854-1-git-send-email-vaurora@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: --- fs/xattr.c | 33 +++++++++++++++++++++++++++------ 1 files changed, 27 insertions(+), 6 deletions(-) diff --git a/fs/xattr.c b/fs/xattr.c index 46f87e8..f930ab7 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -18,6 +18,7 @@ #include #include #include +#include #include @@ -281,17 +282,37 @@ SYSCALL_DEFINE5(setxattr, const char __user *, pathname, size_t, size, int, flags) { struct path path; + struct nameidata nd; + struct vfsmount *mnt; + char *tmp; int error; - error = user_path(pathname, &path); + error = user_path_nd(AT_FDCWD, pathname, LOOKUP_FOLLOW, &nd, &path, + &tmp); if (error) return error; - error = mnt_want_write(path.mnt); - if (!error) { - error = setxattr(path.dentry, name, value, size, flags); - mnt_drop_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; + + error = union_copyup(&nd, &path); + if (error) + goto out_drop_write; + + error = setxattr(path.dentry, name, value, size, flags); + +out_drop_write: + mnt_drop_write(mnt); +out: path_put(&path); + path_put(&nd.path); + putname(tmp); return error; } -- 1.6.3.3