Prev: [PATCH 23/39] fallthru: ext2 fallthru support
Next: [PATCH 03/39] VFS: Add read-only users count to superblock
From: Valerie Aurora on 8 Aug 2010 12:00 Signed-off-by: Valerie Aurora <vaurora(a)redhat.com> --- fs/xattr.c | 31 +++++++++++++++++++++++++------ 1 files changed, 25 insertions(+), 6 deletions(-) diff --git a/fs/xattr.c b/fs/xattr.c index 7869788..67815eb 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -320,17 +320,36 @@ SYSCALL_DEFINE5(lsetxattr, const char __user *, pathname, size_t, size, int, flags) { struct path path; + struct nameidata nd; + struct vfsmount *mnt; + char *tmp; int error; - error = user_lpath(pathname, &path); + error = user_path_nd(AT_FDCWD, pathname, 0, &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_DIR_UNIONED(nd.path.dentry)) + 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |