Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

drbd: Renamed overwrite_peer to primary_force

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Philipp Reisner 15 years ago
parent
d10a33c68b
commit
1f55243024
2 changed files with 2 additions and 2 deletions
Unified View Show Diff Stats
  1. 1 1
      drivers/block/drbd/drbd_nl.c
  2. 1 1
      include/linux/drbd_nl.h

+ 1 - 1
drivers/block/drbd/drbd_nl.c
View File 

@@ -407,7 +407,7 @@ static int drbd_nl_primary(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
 
 	}
 
 	}
 
 
 
 	reply->ret_code =
 
 	reply->ret_code =
 
-		drbd_set_role(mdev, R_PRIMARY, primary_args.overwrite_peer);
 
+		drbd_set_role(mdev, R_PRIMARY, primary_args.primary_force);
 
 
 
 	return 0;
 
 	return 0;
 
 }
 
 }

+ 1 - 1
include/linux/drbd_nl.h
View File 

@@ -12,7 +12,7 @@
 
 #endif
 
 #endif
 
 
 
 NL_PACKET(primary, 1,
 
 NL_PACKET(primary, 1,
 
-       NL_BIT(		1,	T_MAY_IGNORE,	overwrite_peer)
 
+       NL_BIT(		1,	T_MAY_IGNORE,	primary_force)
 
 )
 
 )
 
 
 
 NL_PACKET(secondary, 2, )
 
 NL_PACKET(secondary, 2, )