From 2fe173cbe715856e29e4a9b218305a2c81658c1c Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Sun, 14 Jan 2024 09:37:37 +0900 Subject: [PATCH] lsfd: (refactor) flatten bit fields in struct file Signed-off-by: Masatake YAMATO --- misc-utils/lsfd-file.c | 8 ++++---- misc-utils/lsfd.h | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/misc-utils/lsfd-file.c b/misc-utils/lsfd-file.c index 9b91462d6b..c6d7491728 100644 --- a/misc-utils/lsfd-file.c +++ b/misc-utils/lsfd-file.c @@ -300,8 +300,8 @@ static bool file_fill_column(struct proc *proc, case COL_XMODE: { char r, w, x; char D = file->stat.st_nlink == 0? 'D': '-'; - char L = file->locked.write? 'L' - :file->locked.read? 'l' + char L = file->locked_write? 'L' + :file->locked_read? 'l' : '-'; char m = file->multiplexed? 'm': '-'; @@ -400,10 +400,10 @@ static int file_handle_fdinfo(struct file *file, const char *key, const char* va } else if (strcmp(key, "lock") == 0) { switch (parse_lock_line(value)) { case READ_LOCK: - file->locked.read = 1; + file->locked_read = 1; break; case WRITE_LOCK: - file->locked.write = 1; + file->locked_write = 1; break; } rc = 1; diff --git a/misc-utils/lsfd.h b/misc-utils/lsfd.h index 1859dc746f..14167b5fd2 100644 --- a/misc-utils/lsfd.h +++ b/misc-utils/lsfd.h @@ -185,10 +185,9 @@ struct file { unsigned int sys_flags; unsigned int mnt_id; - struct { - uint8_t read:1, write:1; - } locked; - uint8_t multiplexed; + uint8_t locked_read:1, + locked_write:1, + multiplexed:1; }; #define is_opened_file(_f) ((_f)->association >= 0) -- 2.47.3