From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
xfs_spaceman always records fs_path information for an open file because
spaceman requires running on XFS and it always passes a non-null fs_path
to openfile. Therefore, openfile doesn't need the fs_path null check.
Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx>
---
spaceman/file.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/spaceman/file.c b/spaceman/file.c
index 5647ca7d..29b7d9ce 100644
--- a/spaceman/file.c
+++ b/spaceman/file.c
@@ -71,16 +71,15 @@ _("%s: Not on a mounted XFS filesystem.\n"),
return -1;
}
- if (fs_path) {
- fsp = fs_table_lookup(path, FS_MOUNT_POINT);
- if (!fsp) {
- fprintf(stderr, _("%s: cannot find mount point."),
- path);
- close(fd);
- return -1;
- }
- memcpy(fs_path, fsp, sizeof(struct fs_path));
+ fsp = fs_table_lookup(path, FS_MOUNT_POINT);
+ if (!fsp) {
+ fprintf(stderr, _("%s: cannot find mount point."),
+ path);
+ close(fd);
+ return -1;
}
+ memcpy(fs_path, fsp, sizeof(struct fs_path));
+
return fd;
}
