From eb8204ffe07d1a0aa8ca622279cf22300fa55946 Mon Sep 17 00:00:00 2001 From: Yousaf Kaukab Date: Mar 08 2023 10:03:37 +0000 Subject: Merge remote-tracking branch 'origin/users/ailiopoulos/SLE15-SP5-GA/for-next' into SLE15-SP5-GA Pull XFS fix from Anthony Iliopoulos --- diff --git a/patches.suse/xfs-get-root-inode-correctly-at-bulkstat.patch b/patches.suse/xfs-get-root-inode-correctly-at-bulkstat.patch new file mode 100644 index 0000000..28ede74 --- /dev/null +++ b/patches.suse/xfs-get-root-inode-correctly-at-bulkstat.patch @@ -0,0 +1,49 @@ +From 817644fa4525258992f17fecf4f1d6cdd2e1b731 Mon Sep 17 00:00:00 2001 +From: Hironori Shiina +Date: Mon, 26 Dec 2022 10:11:19 -0800 +Subject: [PATCH] xfs: get root inode correctly at bulkstat +Git-commit: 817644fa4525258992f17fecf4f1d6cdd2e1b731 +Patch-mainline: v6.2-rc4 +References: git-fixes bsc#1207501 ltc#201370 + +The root inode number should be set to `breq->startino` for getting stat +information of the root when XFS_BULK_IREQ_SPECIAL_ROOT is used. +Otherwise, the inode search is started from 1 +(XFS_BULK_IREQ_SPECIAL_ROOT) and the inode with the lowest number in a +filesystem is returned. + +Fixes: bf3cb3944792 ("xfs: allow single bulkstat of special inodes") +Signed-off-by: Hironori Shiina +Reviewed-by: Darrick J. Wong +Signed-off-by: Darrick J. Wong +Acked-by: Anthony Iliopoulos + +--- + fs/xfs/xfs_ioctl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c +index 13f1b2add390..736510bc241b 100644 +--- a/fs/xfs/xfs_ioctl.c ++++ b/fs/xfs/xfs_ioctl.c +@@ -754,7 +754,7 @@ xfs_bulkstat_fmt( + static int + xfs_bulk_ireq_setup( + struct xfs_mount *mp, +- struct xfs_bulk_ireq *hdr, ++ const struct xfs_bulk_ireq *hdr, + struct xfs_ibulk *breq, + void __user *ubuffer) + { +@@ -780,7 +780,7 @@ xfs_bulk_ireq_setup( + + switch (hdr->ino) { + case XFS_BULK_IREQ_SPECIAL_ROOT: +- hdr->ino = mp->m_sb.sb_rootino; ++ breq->startino = mp->m_sb.sb_rootino; + break; + default: + return -EINVAL; +-- +2.35.3 + diff --git a/series.conf b/series.conf index b6f0509..0aa9a6c 100644 --- a/series.conf +++ b/series.conf @@ -36734,6 +36734,7 @@ patches.suse/cifs-protect-access-of-TCP_Server_Info-dstaddr-hostname-.patch patches.suse/cifs-refcount-only-the-selected-iface-during-interface-update.patch patches.suse/cifs-fix-interface-count-calculation-during-refresh.patch + patches.suse/xfs-get-root-inode-correctly-at-bulkstat.patch patches.suse/scsi-storvsc-Fix-swiotlb-bounce-buffer-leak-in-confi.patch patches.suse/scsi-mpi3mr-Refer-CONFIG_SCSI_MPI3MR-in-Makefile.patch patches.suse/scsi-mpt3sas-Remove-usage-of-dma_get_required_mask-A.patch