[PATCH v2 17/29] xfsprogs: Stop using platform_mntent_close()

Pavel Reichl
2021-08-06T21:23:49Z

---
fsr/xfs_fsr.c | 2 +-
include/linux.h | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
index 825ec395..42f477e8 100644
--- a/fsr/xfs_fsr.c
+++ b/fsr/xfs_fsr.c
@@ -369,7 +369,7 @@ initallfs(char *mtab)
mi++;
fs++;
}
- platform_mntent_close(&cursor);
+ mntent_close(&cursor);

numfs = mi;
fsend = (fsbase + numfs);
diff --git a/include/linux.h b/include/linux.h
index 07121e2b..7940fe8c 100644
--- a/include/linux.h
+++ b/include/linux.h
@@ -191,11 +191,16 @@ static inline struct mntent * platform_mntent_next(struct mntent_cursor * cursor
return mntent_next(cursor);
}

-static inline void platform_mntent_close(struct mntent_cursor * cursor)
+static inline void mntent_close(struct mntent_cursor * cursor)
{
endmntent(cursor->mtabp);
}

+static inline void platform_mntent_close(struct mntent_cursor * cursor)
+{
+ return platform_mntent_close(cursor);
+}
+
#if defined(FALLOC_FL_ZERO_RANGE)
static inline int
platform_zero_range(
--
2.31.1