The patch titled
utimensat-implementation update
has been removed from the -mm tree. Its filename was
utimensat-implementation-update.patch
This patch was dropped because it was folded into utimensat-implementation.patch
------------------------------------------------------
Subject: utimensat-implementation update
From: Ulrich Drepper <drepper@xxxxxxxxxx>
The completely missing futimensat() functionality is added. We have such a
function in glibc but we have to resort to using /proc/self/fd/* which not
everybody likes (chroot etc).
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/utimes.c | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff -puN fs/utimes.c~utimensat-implementation-update fs/utimes.c
--- a/fs/utimes.c~utimensat-implementation-update
+++ a/fs/utimes.c
@@ -1,4 +1,5 @@
#include <linux/compiler.h>
+#include <linux/file.h>
#include <linux/fs.h>
#include <linux/linkage.h>
#include <linux/namei.h>
@@ -45,18 +46,34 @@ long do_utimes(int dfd, char __user *fil
{
int error;
struct nameidata nd;
+ struct dentry *dentry;
struct inode *inode;
struct iattr newattrs;
+ struct file *f = NULL;
error = -EINVAL;
if (flags & ~AT_SYMLINK_NOFOLLOW)
goto out;
- error = __user_walk_fd(dfd, filename, (flags & AT_SYMLINK_NOFOLLOW) ? 0 : LOOKUP_FOLLOW, &nd);
- if (error)
- goto out;
+ if (filename == NULL && dfd != AT_FDCWD) {
+ error = -EINVAL;
+ if (flags & AT_SYMLINK_NOFOLLOW)
+ goto out;
+
+ error = -EBADF;
+ f = fget(dfd);
+ if (!f)
+ goto out;
+ dentry = f->f_path.dentry;
+ } else {
+ error = __user_walk_fd(dfd, filename, (flags & AT_SYMLINK_NOFOLLOW) ? 0 : LOOKUP_FOLLOW, &nd);
+ if (error)
+ goto out;
+
+ dentry = nd.dentry;
+ }
- inode = nd.dentry->d_inode;
+ inode = dentry->d_inode;
error = -EROFS;
if (IS_RDONLY(inode))
@@ -94,10 +111,13 @@ long do_utimes(int dfd, char __user *fil
goto dput_and_out;
}
mutex_lock(&inode->i_mutex);
- error = notify_change(nd.dentry, &newattrs);
+ error = notify_change(dentry, &newattrs);
mutex_unlock(&inode->i_mutex);
dput_and_out:
- path_release(&nd);
+ if (f)
+ fput(f);
+ else
+ path_release(&nd);
out:
return error;
}
_
Patches currently in -mm which might be from drepper@xxxxxxxxxx are
lazy-freeing-of-memory-through-madv_free.patch
lazy-freeing-of-memory-through-madv_free-vs-mm-madvise-avoid-exclusive-mmap_sem.patch
restore-madv_dontneed-to-its-original-linux-behaviour.patch
allow-access-to-proc-pid-fd-after-setuid.patch
futex-restartable-futex_wait.patch
aio-is-unlikely.patch
utimensat-implementation.patch
utimensat-implementation-update.patch
futex-priority-based-wakeup.patch
make-futex_wait-use-an-hrtimer-for-timeout.patch
make-futex_wait-use-an-hrtimer-for-timeout-fix.patch
make-futex_wait-use-an-hrtimer-for-timeout-fix-2.patch
futex_requeue_pi-optimization.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
