diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-29 11:20:45 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-08-30 00:34:46 +0300 |
| commit | 8ab761e17efa75449db2d71dc6fabf96d110588c (patch) | |
| tree | ae88a98bdfd1e2935e9929edc58dfc3811001b4e /drivers/block/drbd/drbd_main.c | |
| parent | cde81d99afa4112eecef3f45129b5827f6ac158e (diff) | |
| download | linux-8ab761e17efa75449db2d71dc6fabf96d110588c.tar.xz | |
drbd: rename "usermode_helper" to "drbd_usermode_helper"
Nothing like having a very generic global variable in a tiny driver
subsystem to make a mess of the global namespace...
Note, there are many other "generic" named global variables in the drbd
subsystem, someone should fix those up one day before they hit a linking
error.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/drbd/drbd_main.c')
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 8b8dd82da3c4..bdd9ab286a48 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -109,9 +109,9 @@ int proc_details; /* Detail level in proc drbd*/ /* Module parameter for setting the user mode helper program * to run. Default is /sbin/drbdadm */ -char usermode_helper[80] = "/sbin/drbdadm"; +char drbd_usermode_helper[80] = "/sbin/drbdadm"; -module_param_string(usermode_helper, usermode_helper, sizeof(usermode_helper), 0644); +module_param_string(usermode_helper, drbd_usermode_helper, sizeof(drbd_usermode_helper), 0644); /* in 2.6.x, our device mapping and config info contains our virtual gendisks * as member "struct gendisk *vdisk;" |