sysfs: sysfs_get_byteorder: add context parameter

This can be used to read the file /sys/kernel/cpu_byteorder from an
alternative root-directory.

diff --git a/include/sysfs.h b/include/sysfs.h
index a5200141bfa4c185e8883796bf357f4ddf95ac4c..56e125b71f7d1e8bd4de68a5d2d7925bbc87dcef 100644 (file)
--- a/include/sysfs.h
+++ b/include/sysfs.h
@@ -116,6 +116,6 @@ enum sysfs_byteorder {
        SYSFS_BYTEORDER_BIG,
 };
 
-extern enum sysfs_byteorder sysfs_get_byteorder(void);
+extern enum sysfs_byteorder sysfs_get_byteorder(struct path_cxt *pc);
 
 #endif /* UTIL_LINUX_SYSFS_H */

diff --git a/lib/sysfs.c b/lib/sysfs.c
index ad6b31fb816ef1b2023ae008447206945e763afc..56eea5c6450a311bc45e4708bac031c19f349a15 100644 (file)
--- a/lib/sysfs.c
+++ b/lib/sysfs.c
@@ -1072,13 +1072,13 @@ char *sysfs_chrdev_devno_to_devname(dev_t devno, char *buf, size_t bufsiz)
 
 }
 
-enum sysfs_byteorder sysfs_get_byteorder(void)
+enum sysfs_byteorder sysfs_get_byteorder(struct path_cxt *pc)
 {
        int rc;
        char buf[BUFSIZ];
        enum sysfs_byteorder ret;
 
-       rc = ul_path_read_buffer(NULL, buf, sizeof(buf), _PATH_SYS_CPU_BYTEORDER);
+       rc = ul_path_read_buffer(pc, buf, sizeof(buf), _PATH_SYS_CPU_BYTEORDER);
        if (rc < 0)
                goto unknown;
 

diff --git a/misc-utils/lsfd-sock-xinfo.c b/misc-utils/lsfd-sock-xinfo.c
index ca6b8ee48cf8673ecbaba3d1c64d1c27d4f0a85a..aae4e84df7793e8516b9d3fb598d04c8a8ff4ed3 100644 (file)
--- a/misc-utils/lsfd-sock-xinfo.c
+++ b/misc-utils/lsfd-sock-xinfo.c
@@ -637,7 +637,7 @@ static void load_xinfo_from_proc_inet_L3(ino_t netns_inode, const char *proc_fil
                /* Unexpected line */
                goto out;
 
-       enum sysfs_byteorder byteorder = sysfs_get_byteorder();
+       enum sysfs_byteorder byteorder = sysfs_get_byteorder(NULL);
 
        while (fgets(line, sizeof(line), tcp_fp)) {
                unsigned long local_addr;

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 080c9f6e9c1112a12aa37c0d52f30a7f3f719a88..f706b342915d11db89c4bb17930b5e1d76589136 100644 (file)
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -1000,7 +1000,7 @@ static void print_summary(struct lscpu_cxt *cxt)
        if (ct && ct->addrsz)
                add_summary_s(tb, sec, _("Address sizes:"), ct->addrsz);
 
-       if (sysfs_get_byteorder() == SYSFS_BYTEORDER_LITTLE)
+       if (sysfs_get_byteorder(NULL) == SYSFS_BYTEORDER_LITTLE)
                add_summary_s(tb, sec, _("Byte Order:"), "Little Endian");
        else
                add_summary_s(tb, sec, _("Byte Order:"), "Big Endian");