[PATCH 37/39] union-mount: Implement union-aware utimensat()
in [Kernel]
|
Prev: [PATCH 34/39] union-mount: Implement union-aware truncate()
Next: [PATCH 07/39] whiteout: Set S_OPAQUE inode flag when creating directories
From: Valerie Aurora on 3 May 2010 19:20 --- fs/utimes.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/fs/utimes.c b/fs/utimes.c index e4c75db..fb32111 100644 --- a/fs/utimes.c +++ b/fs/utimes.c @@ -8,6 +8,8 @@ #include <linux/stat.h> #include <linux/utime.h> #include <linux/syscalls.h> +#include <linux/union.h> +#include <linux/slab.h> #include <asm/uaccess.h> #include <asm/unistd.h> @@ -152,18 +154,26 @@ long do_utimes(int dfd, char __user *filename, struct timespec *times, int flags error = utimes_common(&file->f_path, times); fput(file); } else { + struct nameidata nd; + char *tmp; struct path path; int lookup_flags = 0; if (!(flags & AT_SYMLINK_NOFOLLOW)) lookup_flags |= LOOKUP_FOLLOW; - error = user_path_at(dfd, filename, lookup_flags, &path); + error = user_path_nd(dfd, filename, lookup_flags, &nd, &path, + &tmp); if (error) goto out; - error = utimes_common(&path, times); + error = union_copyup(&nd, &path); + + if (!error) + error = utimes_common(&path, times); path_put(&path); + path_put(&nd.path); + putname(tmp); } out: -- 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/ |