]> err.no Git - linux-2.6/commit
[patch for 2.6.26 2/4] vfs: utimensat(): be consistent with utime() for immutable...
authorMichael Kerrisk <mtk.manpages@googlemail.com>
Tue, 10 Jun 2008 04:16:07 +0000 (21:16 -0700)
committerAl Viro <viro@zeniv.linux.org.uk>
Mon, 23 Jun 2008 12:43:03 +0000 (08:43 -0400)
commit12fd0d3088d27867be68655bcab2b074f2835f60
tree088cf4d5ffc4f4f094b443f1186250403d296132
parentfe6e9c1f25ac01f848bd084ee0ee62a5a0966ff3
[patch for 2.6.26 2/4] vfs: utimensat(): be consistent with utime() for immutable and append-only files

This patch fixes utimensat() to make its behavior consistent
with that of utime()/utimes() when dealing with files marked
immutable and append-only.

The current utimensat() implementation also returns EPERM if
'times' is non-NULL and the tv_nsec fields are both UTIME_NOW.
For consistency, the

(times != NULL && times[0].tv_nsec == UTIME_NOW &&
                  times[1].tv_nsec == UTIME_NOW)

case should be treated like the traditional utimes() case where
'times' is NULL.  That is, the call should succeed for a file
marked append-only and should give the error EACCES if the file
is marked as immutable.

The simple way to do this is to set 'times' to NULL
if (times[0].tv_nsec == UTIME_NOW && times[1].tv_nsec == UTIME_NOW).

This is also the natural approach, since POSIX.1 semantics consider the
times == {{x, UTIME_NOW}, {y, UTIME_NOW}}
to be exactly equivalent to the case for
times == NULL.

(Thanks to Miklos for pointing this out.)

Patch 3 in this series relies on the simplification provided
by this patch.

Acked-by: Miklos Szeredi <miklos@szeredi.hu>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Ulrich Drepper <drepper@redhat.com>
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/utimes.c