lsfd: rename the column DEVICE to MAJ:MIN

Reflecting the review comment:

    add MAJ:MIN for major and minor numbers, remove DEVICE (we use
    MAJ:MIN in other tools)

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

diff --git a/misc-utils/lsfd-bdev.c b/misc-utils/lsfd-bdev.c
index e640a0d39efd0e61583d409f1f27570137b79aa8..928b1e3bda12a30cf2b8b96b25435d1c2363860c 100644 (file)
--- a/misc-utils/lsfd-bdev.c
+++ b/misc-utils/lsfd-bdev.c
@@ -55,7 +55,7 @@ static bool bdev_fill_column(struct proc *proc __attribute__((__unused__)),
                        break;
                }
                /* FALL THROUGH */
-       case COL_DEVICE:
+       case COL_MAJMIN:
                xasprintf(&str, "%u:%u",
                          major(file->stat.st_rdev),
                          minor(file->stat.st_rdev));

diff --git a/misc-utils/lsfd-cdev.c b/misc-utils/lsfd-cdev.c
index c56123110db4b072d8904b06ab1830692741a397..5344c2989223e96cea897f489bc4f17dce8ddece 100644 (file)
--- a/misc-utils/lsfd-cdev.c
+++ b/misc-utils/lsfd-cdev.c
@@ -90,7 +90,7 @@ static bool cdev_fill_column(struct proc *proc __attribute__((__unused__)),
                        break;
                }
                /* FALL THROUGH */
-       case COL_DEVICE:
+       case COL_MAJMIN:
                xasprintf(&str, "%u:%u",
                          major(file->stat.st_rdev),
                          minor(file->stat.st_rdev));

diff --git a/misc-utils/lsfd-file.c b/misc-utils/lsfd-file.c
index 0fd4f54da04232dec5a1716c24eed95d23ca4011..d9a7a19001b95fb0c245b678383ffccdcb80433d 100644 (file)
--- a/misc-utils/lsfd-file.c
+++ b/misc-utils/lsfd-file.c
@@ -241,7 +241,7 @@ static bool file_fill_column(struct proc *proc,
                }
                /* FALL THROUGH */
        case COL_DEV:
-       case COL_DEVICE:
+       case COL_MAJMIN:
                xasprintf(&str, "%u:%u",
                          major(file->stat.st_dev),
                          minor(file->stat.st_dev));

diff --git a/misc-utils/lsfd.c b/misc-utils/lsfd.c
index bee064ea35e850e9f9917eb7724e99e0b4e9f498..3a7f5c89b2730353587abcff1418ec06236675de 100644 (file)
--- a/misc-utils/lsfd.c
+++ b/misc-utils/lsfd.c
@@ -107,8 +107,6 @@ static struct colinfo infos[] = {
                N_("reachability from the file system") },
        [COL_DEV]     = { "DEV",      0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING,
                N_("ID of device containing file") },
-       [COL_DEVICE]  = { "DEVICE",   0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING,
-               N_("device ID for special, or ID of device containing file") },
        [COL_DEVNAME] = { "DEVNAME",  0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING,
                N_("device name, decoded version of DEVICE") },
        [COL_FLAGS]   = { "FLAGS",    0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING,
@@ -117,6 +115,8 @@ static struct colinfo infos[] = {
                N_("file descriptor for the file") },
        [COL_INODE]   = { "INODE",    0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER,
                N_("inode number") },
+       [COL_MAJMIN]  = { "MAJ:MIN",  0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING,
+               N_("device ID for special, or ID of device containing file") },
        [COL_MAPLEN]  = { "MAPLEN",   0, SCOLS_FL_RIGHT, SCOLS_JSON_NUMBER,
                N_("length of file mapping (in page)") },
        [COL_MISCDEV] = { "MISCDEV",  0, SCOLS_FL_RIGHT, SCOLS_JSON_STRING,

diff --git a/misc-utils/lsfd.h b/misc-utils/lsfd.h
index 178ca3396d215cf26ed07b9eaa7b5e7a80c053d5..c1b791d8383bee9f4e4e64a85b2b7be1628b0985 100644 (file)
--- a/misc-utils/lsfd.h
+++ b/misc-utils/lsfd.h
@@ -44,12 +44,12 @@ enum {
        COL_CHRDRV,
        COL_COMMAND,
        COL_DELETED,
-       COL_DEVICE,
        COL_DEVNAME,
        COL_DEV,
        COL_FD,
        COL_FLAGS,
        COL_INODE,
+       COL_MAJMIN,
        COL_MAPLEN,
        COL_MISCDEV,
        COL_MNT_ID,