open_noatime wrapper to deal with EPERM on O_NOATIME

We favor O_NOATIME in a variety of places, use it when we can,
but fall back gracefully when we cannot.

1 files changed, 1 insertions, 7 deletions

diff --git a/fadvise.c b/fadvise.c
index b4b85d7..72ef3a3 100644
--- a/fadvise.c
+++ b/fadvise.c
@@ -30,16 +30,10 @@ static void apply_fadvise(const char *path, off_t offset, off_t len, int advice)
 {
         int fd;
 
-        if ((fd = open(path, O_RDONLY|O_NOATIME)) < 0) {
-                if (errno == EPERM && O_NOATIME != 0) {
-                        fd = open(path, O_RDONLY);
-                        if (fd >= 0)
-                                goto ok;
-                }
+        if ((fd = open_noatime(path) < 0)) {
                 fprintf(stderr, "%s: open(): %s\n", path, strerror(errno));
                 return;
         }
-ok:
 
         if (len <= 0) {
                 /* for compatibility with kernels < 2.6.6 */