commit cdcffc0d29da177399eb403df00e6693ce5e83bb
author Nick Kralevich <nnk@google.com> Thu Mar 05 21:03:15 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 05 21:03:15 2015 +0000
tree a269ef914b4a4311c1687d2c2912c95174659c01
parent 47bc0ffaddacc3514d12db1b8b8bb4b10eae13ea
parent 3393bb650fd931e494a0280fc13717f36aea22fc

am 3393bb65: Merge "fstrim.c: use open(O_DIRECTORY) instead of stat"

* commit '3393bb650fd931e494a0280fc13717f36aea22fc':
  fstrim.c: use open(O_DIRECTORY) instead of stat

fstrim.c

diff --git a/fstrim.c b/fstrim.c
index 2769643..2c24fc9 100644
--- a/fstrim.c
+++ b/fstrim.c
@@ -62,7 +62,6 @@
     int fd;
     int ret = 0;
     struct fstrim_range range = { 0 };
-    struct stat sb;
     extern struct fstab *fstab;
     int deep_trim = !!thread_arg;
 
@@ -90,18 +89,7 @@
             continue; /* Should we trim fat32 filesystems? */
         }
 
-        if (stat(fstab->recs[i].mount_point, &sb) == -1) {
-            SLOGE("Cannot stat mount point %s\n", fstab->recs[i].mount_point);
-            ret = -1;
-            continue;
-        }
-        if (!S_ISDIR(sb.st_mode)) {
-            SLOGE("%s is not a directory\n", fstab->recs[i].mount_point);
-            ret = -1;
-            continue;
-        }
-
-        fd = open(fstab->recs[i].mount_point, O_RDONLY);
+        fd = open(fstab->recs[i].mount_point, O_RDONLY | O_DIRECTORY | O_CLOEXEC | O_NOFOLLOW);
         if (fd < 0) {
             SLOGE("Cannot open %s for FITRIM\n", fstab->recs[i].mount_point);
             ret = -1;