Skip to contentSkip to conversation

staging: lustre: Remove redundant code

PATCH In review Arushi Singhal 3 participants 3 messages Mar 24, 2017 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: lustre: Remove redundant code

Remove the code which do not have any value.

---
 drivers/staging/lustre/lnet/lnet/net_fault.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/staging/lustre/lnet/lnet/net_fault.c +0 -5
index 18183cbb9859..b60261db9e67 100644
@@ -997,11 +997,6 @@ lnet_fault_ctl(int opc, struct libcfs_ioctl_data *data)
 int
 lnet_fault_init(void)
 {
-	BUILD_BUG_ON(LNET_PUT_BIT != 1 << LNET_MSG_PUT);
-	BUILD_BUG_ON(LNET_ACK_BIT != 1 << LNET_MSG_ACK);
-	BUILD_BUG_ON(LNET_GET_BIT != 1 << LNET_MSG_GET);
-	BUILD_BUG_ON(LNET_REPLY_BIT != 1 << LNET_MSG_REPLY);
-
 	mutex_init(&delay_dd.dd_mutex);
 	spin_lock_init(&delay_dd.dd_lock);
 	init_waitqueue_head(&delay_dd.dd_waitq);
Signature · 1 line
2.11.0
#1 lore raw
Quoted 12 lines · Arushi Singhal

Remove the code which do not have any value.

---
 drivers/staging/lustre/lnet/lnet/net_fault.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/staging/lustre/lnet/lnet/net_fault.c +0 -0
index 18183cbb9859..b60261db9e67 100644

drivers/staging/lustre/lnet/lnet/net_fault.c lnet_fault_ctl(int opc, struct libcfs_ioctl_data *data) · line 1003

Quoted 7 lines
drivers/staging/lustre/lnet/lnet/net_fault.c +0 -4
@@ -997,11 +997,6 @@ lnet_fault_ctl(int opc, struct libcfs_ioctl_data *data)
 int
 lnet_fault_init(void)
 {
-	BUILD_BUG_ON(LNET_PUT_BIT != 1 << LNET_MSG_PUT);
-	BUILD_BUG_ON(LNET_ACK_BIT != 1 << LNET_MSG_ACK);
-	BUILD_BUG_ON(LNET_GET_BIT != 1 << LNET_MSG_GET);
-	BUILD_BUG_ON(LNET_REPLY_BIT != 1 << LNET_MSG_REPLY);

Why does this not have any value? How are you ensuring that these requirements are now being met?

thanks,

greg k-h

#2 lore raw
Quoted 9 lines · Greg Kroah-Hartman
Quoted 7 lines · Arushi Singhal

Remove the code which do not have any value.

---
drivers/staging/lustre/lnet/lnet/net_fault.c | 5 -----

1 file changed, 5 deletions(-)
Quoted 15 lines

drivers/staging/lustre/lnet/lnet/net_fault.c lnet_fault_ctl(int opc, struct libcfs_ioctl_data *data) · line 1003

Quoted 12 lines
drivers/staging/lustre/lnet/lnet/net_fault.c +0 -0
index 18183cbb9859..b60261db9e67 100644
@@ -997,11 +997,6 @@ lnet_fault_ctl(int opc, struct libcfs_ioctl_data *data)

int
lnet_fault_init(void)
{

drivers/staging/lustre/lnet/lnet/net_fault.c +0 -4
-	BUILD_BUG_ON(LNET_PUT_BIT != 1 << LNET_MSG_PUT);
-	BUILD_BUG_ON(LNET_ACK_BIT != 1 << LNET_MSG_ACK);
-	BUILD_BUG_ON(LNET_GET_BIT != 1 << LNET_MSG_GET);
-	BUILD_BUG_ON(LNET_REPLY_BIT != 1 << LNET_MSG_REPLY);

Why does this not have any value? How are you ensuring that these requirements are now being met?

It was my recommendation to remove these checks, though on closer review I might have been a bit premature. For some reason I thought the LNET_*_BIT constants were defined in terms of LNET_MSG_*, but I see they are not.

In conjunction with this change, the definition of LNET_*_BIT should be changed to be defined in terms of the LNET_MSG_* constants:

#define LNET_PUT_BIT BIT(LNET_MSG_PUT)
#define LNET_ACK_BIT BIT(LNET_MSG_ACK)
#define LNET_GET_BIT BIT(LNET_MSG_GET)
#define LNET_REPLY_BIT BIT(LNET_MSG_REPLY)

The alternative would be to remove the LNET_*_BIT constants and use BIT(LNET_MSG_*) directly in the code, since that is easy enough to read compared to (1 << LNET_MSG_*) everywhere. There don't seem to be a lot of users, so this wouldn't be a giant patch.

Cheers, Andreas
--
Andreas Dilger
Lustre Principal Architect
Intel Corporation