src/linux-acpi-root.c | 7 0 + 7 - 0 !
src/linux-emmc.c | 9 0 + 9 - 0 !
src/linux-md.c | 8 0 + 8 - 0 !
src/linux-nvme.c | 9 0 + 9 - 0 !
src/linux-pci-root.c | 7 0 + 7 - 0 !
src/linux-pci.c | 8 0 + 8 - 0 !
src/linux-sata.c | 11 0 + 11 - 0 !
src/linux-scsi.c | 24 0 + 24 - 0 !
src/linux-soc-root.c | 7 0 + 7 - 0 !
src/linux-virtblk.c | 8 0 + 8 - 0 !
src/util.h | 1 0 + 1 - 0 !
11 files changed, 99 deletions(-)

---

src/linux-acpi-root.c | 2 1 + 1 - 0 !
src/linux-pci-root.c | 2 1 + 1 - 0 !
src/linux-pci.c | 2 1 + 1 - 0 !
src/linux-soc-root.c | 2 1 + 1 - 0 !
src/linux-virtblk.c | 2 1 + 1 - 0 !
5 files changed, 5 insertions(+), 5 deletions(-)

 [patch] always initialize any variable we use with sscanf's %n

Signed-off-by: Peter Jones <pjones@redhat.com>

Bug-Ubuntu: https://bugs.launchpad.net/bugs/1892792

src/linux.c | 12 10 + 2 - 0 !
1 file changed, 10 insertions(+), 2 deletions(-)

 [patch] fix the error path in set_disk_and_part_name()

Signed-off-by: Peter Jones <pjones@redhat.com>

[ dannf: Context adjustments due to upstream whitespace cleanup;
  Included to simplify the application of
  0003-Try-even-harder-to-find-disk-device-symlinks-in-sysf.patch ]

Bug-Ubuntu: https://bugs.launchpad.net/bugs/1891718
Bug: https://github.com/rhboot/efivar/issues/157

src/linux-nvme.c | 22 14 + 8 - 0 !
1 file changed, 14 insertions(+), 8 deletions(-)

 [patch] sysfs parsers: make all the /sys/block link parsers work the
 same way

Apparently I wrote some of these one way and some the other, and the one
special case where everything was "current+sz" instead of some form of
"current += pos; sz += pos; ...; return sz;" or the subtraction version.

Make them all the same, where possible.

Signed-off-by: Peter Jones <pjones@redhat.com>

[ dannf: Restrict to just linux-nvme.c;
  Context adjustments due to upstream whitespace cleanup;
  drop call to dbgmk() call - it didn't exist in v37;
  included to simplify application of later patches in series ]

Bug-Ubuntu: https://bugs.launchpad.net/bugs/1891718
Bug: https://github.com/rhboot/efivar/issues/157

src/linux-nvme.c | 13 6 + 7 - 0 !
src/linux.c | 44 26 + 18 - 0 !
src/linux.h | 69 68 + 1 - 0 !
3 files changed, 100 insertions(+), 26 deletions(-)

 [patch] try even harder to find disk device symlinks in sysfs.

Today's realization is that the thing encoded into the structure of
sysfs is, in the best case, the dependency graph of the makefile targets
to build a device driver.

In the case of nvme-fabric, or really wherever the kernel has
class_create() and device_create() in the same function, there's an
extra level of indirection.

Anyway, in this patch we stop pretending sysfs isn't completely absurd,
and just try adding "/device" in the middle of the driver symlink path,
until we actually either get ENOENT on the device symlink or find a
device symlink that actually has a driver symlink under it.

Signed-off-by: Peter Jones <pjones@redhat.com>

[ dannf: Context adjustments due to upstream whitespace cleanup;
  Adjust to omit efi_error_pop() call that didn't exist in v37;
  included to simplify application of later patches in series ]

Bug-Ubuntu: https://bugs.launchpad.net/bugs/1891718
Bug: https://github.com/rhboot/efivar/issues/157

src/linux-nvme.c | 51 44 + 7 - 0 !
src/linux-virtual-root.c | 87 87 + 0 - 0 !
src/linux.c | 43 37 + 6 - 0 !
src/linux.h | 4 3 + 1 - 0 !
4 files changed, 171 insertions(+), 14 deletions(-)

 [patch] handle /sys/devices/virtual/{nvme-fabrics,nvme-subsystem}
 devices

Signed-off-by: Peter Jones <pjones@redhat.com>

[ dannf: Context adjustments due to upstream whitespace cleanup and
  dbgmk() calls;
  drop new calls to dbgmk() - it didn't exist in v37 ]

Bug-Ubuntu: https://bugs.launchpad.net/bugs/1891718
Bug: https://github.com/rhboot/efivar/issues/157

src/linux-virtual-root.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 [patch 2/2] fix variable 'sz' uninitialized error

To fix the error:

external/efivar/src/linux-virtual-root.c:66:4: error: variable 'sz' is uninitialized when used here [-Werror,-Wuninitialized]
                        sz += pos1;
                        ^~
external/efivar/src/linux-virtual-root.c:45:12: note: initialize the variable 'sz' to silence this warning
        ssize_t sz;
                  ^
                   = 0
1 error generated.

Fixes: c41da0bd ("Handle /sys/devices/virtual/{nvme-fabrics,nvme-subsystem} devices")

Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>

Bug-Ubuntu: https://bugs.launchpad.net/bugs/1891718
Bug: https://github.com/rhboot/efivar/issues/157

src/linux-nvme.c | 41 27 + 14 - 0 !
1 file changed, 27 insertions(+), 14 deletions(-)

 [patch] fix parsing for nvme-subsystem devices

nvme-subsystem devices have a link that looks like:
  ../../devices/virtual/nvme-subsystem/nvme-subsys0/nvme0n1

However, the current code expects an additional /nvme0/ component, i.e.:
  ../../devices/virtual/nvme-subsystem/nvme-subsys0/nvme0/nvme0n1

Fix this by adding a separate branch for parsing nvme-subsystem devices.

Resolves github issue #157.

Signed-off-by: dann frazier <dann.frazier@canonical.com>

[ dannf: Context adjustments due to upstream whitespace cleanup and
  dbgmk() calls ]

Bug-Ubuntu: https://bugs.launchpad.net/bugs/1891718
Bug: https://github.com/rhboot/efivar/issues/157