Skip to contentSkip to conversation

block/ltp_block_dev.c: Fix error on older distributions

PATCH New Jinhui huang 2 participants 3 messages Mar 11, 2019 – Mar 14, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 block/ltp_block_dev.c: Fix error on older distributions

major number was limited to 511(i.e. BLKDEV_MAJOR_MAX - 1) by commit 133d55c since kernel v4.14 so that register_blkdev() with a major number gather than 511 got failure on older distributions. It's just a change of limit rather than bug fix so we want to accept both of results on all kernels.

Fixes 8d19ee6 ("block/ltp_block_dev.c: Update tests for the newer kernel")
---
 .../kernel/device-drivers/block/block_dev_kernel/ltp_block_dev.c     | 5 +++++
 1 file changed, 5 insertions(+)
testcases/kernel/device-drivers/block/block_dev_kernel/ltp_block_dev.c +5 -0
index b0f6ce5..c7c8683 100644
@@ -232,10 +232,15 @@ static int tc05(void)
 
 		if (major == 0) {
 			unregister_blkdev(test_major[i], BLK_DEV_NAME);
+#ifdef BLKDEV_MAJOR_MAX
 			pass = 0;
+#endif
 		} else {
 			prk_debug("register_blkdev() with major %u got error %i\n",
 				  test_major[i], major);
+#ifndef BLKDEV_MAJOR_MAX
+			pass = 0;
+#endif
 		}
 	}
 
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/1 block/ltp_block_dev.c: Fix error on older distributions

Hi Jinhui,

It looks good to me. :-)

Best Regards,
Xiao Yang

Quoted 32 lines · Jinhui huang

major number was limited to 511(i.e. BLKDEV_MAJOR_MAX - 1) by commit 133d55c since kernel v4.14 so that register_blkdev() with a major number gather than 511 got failure on older distributions. It's just a change of limit rather than bug fix so we want to accept both of results on all kernels.

Fixes 8d19ee6 ("block/ltp_block_dev.c: Update tests for the newer kernel")
---
 .../kernel/device-drivers/block/block_dev_kernel/ltp_block_dev.c     | 5 +++++
 1 file changed, 5 insertions(+)
testcases/kernel/device-drivers/block/block_dev_kernel/ltp_block_dev.c +5 -0
index b0f6ce5..c7c8683 100644
@@ -232,10 +232,15 @@ static int tc05(void)
 
 		if (major == 0) {
 			unregister_blkdev(test_major[i], BLK_DEV_NAME);
+#ifdef BLKDEV_MAJOR_MAX
 			pass = 0;
+#endif
 		} else {
 			prk_debug("register_blkdev() with major %u got error %i\n",
 				  test_major[i], major);
+#ifndef BLKDEV_MAJOR_MAX
+			pass = 0;
+#endif
 		}
 	}
 
#2 lore raw

PATCH 1/1 block/ltp_block_dev.c: Fix error on older distributions

Hi,

Pushed, thanks.

Best Regards,
Xiao Yang

Quoted 43 lines · Xiao Yang

Hi Jinhui,

It looks good to me. :-)

Best Regards,
Xiao Yang

Quoted 32 lines · Jinhui huang

major number was limited to 511(i.e. BLKDEV_MAJOR_MAX - 1) by commit 133d55c since kernel v4.14 so that register_blkdev() with a major number gather than 511 got failure on older distributions. It's just a change of limit rather than bug fix so we want to accept both of results on all kernels.

Fixes 8d19ee6 ("block/ltp_block_dev.c: Update tests for the newer kernel")
---
  .../kernel/device-drivers/block/block_dev_kernel/ltp_block_dev.c     | 5 +++++
  1 file changed, 5 insertions(+)
testcases/kernel/device-drivers/block/block_dev_kernel/ltp_block_dev.c +5 -0
index b0f6ce5..c7c8683 100644
@@ -232,10 +232,15 @@ static int tc05(void)
 
  		if (major == 0) {
  			unregister_blkdev(test_major[i], BLK_DEV_NAME);
+#ifdef BLKDEV_MAJOR_MAX
  			pass = 0;
+#endif
  		} else {
  			prk_debug("register_blkdev() with major %u got error %i\n",
  				  test_major[i], major);
+#ifndef BLKDEV_MAJOR_MAX
+			pass = 0;
+#endif
  		}
  	}