[PATCH 35/39] union-mount: Implement union-aware chmod()/fchmodat()
in [Kernel]
|
Prev: [PATCH 30/39] union-mount: Implement union-aware link()
Next: [PATCH 39/39] union-mount: Implement union-aware lsetxattr()
From: Valerie Aurora on 3 May 2010 19:20 --- fs/open.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/fs/open.c b/fs/open.c index fa3ecae..866041c 100644 --- a/fs/open.c +++ b/fs/open.c @@ -669,18 +669,32 @@ out: SYSCALL_DEFINE3(fchmodat, int, dfd, const char __user *, filename, mode_t, mode) { struct path path; + struct nameidata nd; + struct vfsmount *mnt; struct inode *inode; + char *tmp; int error; struct iattr newattrs; - error = user_path_at(dfd, filename, LOOKUP_FOLLOW, &path); + error = user_path_nd(dfd, filename, LOOKUP_FOLLOW, &nd, + &path, &tmp); if (error) goto out; - inode = path.dentry->d_inode; - 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 dput_and_out; + + error = union_copyup(&nd, &path); + if (error) + goto mnt_drop_write_and_out; + + inode = path.dentry->d_inode; mutex_lock(&inode->i_mutex); error = security_path_chmod(path.dentry, path.mnt, mode); if (error) @@ -692,9 +706,12 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, const char __user *, filename, mode_t, mode) error = notify_change(path.dentry, &newattrs); out_unlock: mutex_unlock(&inode->i_mutex); - mnt_drop_write(path.mnt); +mnt_drop_write_and_out: + mnt_drop_write(mnt); dput_and_out: 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(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/ |