tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* commit '3393bb650fd931e494a0280fc13717f36aea22fc':
  fstrim.c: use open(O_DIRECTORY) instead of stat
This commit is contained in:
Nick Kralevich 2015-03-05 21:03:15 +00:00 committed by Android Git Automerger
commit cdcffc0d29
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fstrim.c
View file

@ -62,7 +62,6 @@ static void *do_fstrim_filesystems(void *thread_arg)
int fd; int fd;
int ret = 0; int ret = 0;
struct fstrim_range range = { 0 }; struct fstrim_range range = { 0 };
struct stat sb;
extern struct fstab *fstab; extern struct fstab *fstab;
int deep_trim = !!thread_arg; int deep_trim = !!thread_arg;
@ -90,18 +89,7 @@ static void *do_fstrim_filesystems(void *thread_arg)
continue; /* Should we trim fat32 filesystems? */ continue; /* Should we trim fat32 filesystems? */
} }
if (stat(fstab->recs[i].mount_point, &sb) == -1) { fd = open(fstab->recs[i].mount_point, O_RDONLY | O_DIRECTORY | O_CLOEXEC | O_NOFOLLOW);
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);
if (fd < 0) { if (fd < 0) {
SLOGE("Cannot open %s for FITRIM\n", fstab->recs[i].mount_point); SLOGE("Cannot open %s for FITRIM\n", fstab->recs[i].mount_point);
ret = -1; ret = -1;