diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-07-26 20:58:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-26 20:58:52 +0000 |
| commit | d08fb19bbb34f5752dd800795fcef077df2d137a (patch) | |
| tree | 15bf73e9bcb996cc0d4d3f7cfa1d2eaaeb2d63d6 | |
| parent | 2d0e940e9088aa4c759a0d7ba57f2a1850a180d6 (diff) | |
| parent | 1cfa16f2709aa4f020c3a489817ca8bc05b42127 (diff) | |
| download | e2fsprogs-d08fb19bbb34f5752dd800795fcef077df2d137a.tar.gz | |
Merge "libext2fs: avoid unnecessary stat(2) calls on mountpoints" am: 1cfa16f270
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1777845
Change-Id: Id0bb6d77b5676c63d3284128a136e87bda81cba3
| -rw-r--r-- | lib/ext2fs/ismounted.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c index 46d330d9..c9e6a9d0 100644 --- a/lib/ext2fs/ismounted.c +++ b/lib/ext2fs/ismounted.c @@ -128,14 +128,14 @@ static errcode_t check_mntent_file(const char *mtab_file, const char *file, while ((mnt = getmntent (f)) != NULL) { if (mnt->mnt_fsname[0] != '/') continue; - if (stat(mnt->mnt_dir, &st_buf) != 0) - continue; if (strcmp(file, mnt->mnt_fsname) == 0) { + if (stat(mnt->mnt_dir, &st_buf) != 0) + continue; if (file_rdev && (file_rdev != st_buf.st_dev)) { #ifdef DEBUG printf("Bogus entry in %s! " - "(%s does not exist)\n", - mtab_file, mnt->mnt_dir); + "(%s is not mounted on %s)\n", + mtab_file, file, mnt->mnt_dir); #endif /* DEBUG */ continue; } |