From: Karel Zak <kzak@redhat.com>
Date: Fri, 29 Oct 2010 18:04:00 +0000 (+0200)
Subject: mount: use utimensat(AT_FDCWD) rather than open()+futimens()
X-Git-Tag: v2.19-rc1~288
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a21640baec08b7b20e7d829c3aae87e35d5dbf04;p=thirdparty%2Futil-linux.git

mount: use utimensat(AT_FDCWD) rather than open()+futimens()

Thanks to Kay Sievers.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/mount/mount.c b/mount/mount.c
index 0567418db3..1c8a55fd3b 100644
--- a/mount/mount.c
+++ b/mount/mount.c
@@ -1313,8 +1313,6 @@ cdrom_setspeed(const char *spec) {
 static int
 is_readonly(const char *path)
 {
-	int fd;
-
 	if (access(path, W_OK) == 0)
 		return 0;
 	if (errno == EROFS)
@@ -1332,19 +1330,14 @@ is_readonly(const char *path)
 	 *
 	 * - for read-write filesystem with read-only VFS node (aka -o remount,ro,bind)
 	 */
-	fd = open(path, O_RDONLY);
-	if (fd >= 0) {
+	{
 		struct timespec times[2];
-		int errsv = 0;
 
 		times[0].tv_nsec = UTIME_NOW;	/* atime */
 		times[1].tv_nsec = UTIME_OMIT;	/* mtime */
 
-		if (futimens(fd, times) == -1)
-			errsv = errno;
-		close(fd);
-
-		return errsv == EROFS;
+		if (utimensat(AT_FDCWD, path, times, 0) == -1)
+			return errno == EROFS;
 	}
 #endif
 	return 0;