From 403a74da5d3287489829c629d42643b8b320ee62 Mon Sep 17 00:00:00 2001 From: Meghana Madhusudhan Date: Mon, 20 Apr 2015 10:41:47 +0530 Subject: NFS-Ganesha : Locking global options file Global option gluster features.ganesha enable writes into the global 'option' file. The snapshot feature also writes into the same file. To handle concurrent multiple transactions correctly, a new lock has to be introduced on this file. Every operation using this file needs to contest for the new lock type. Change-Id: Ia8a324d2a466717b39f2700599edd9f345b939a9 BUG: 1200254 Signed-off-by: Meghana Madhusudhan Reviewed-on: http://review.gluster.org/10130 Reviewed-by: Avra Sengupta Tested-by: Gluster Build System Reviewed-by: soumya k Tested-by: NetBSD Build System Reviewed-by: Kaleb KEITHLEY --- xlators/mgmt/glusterd/src/glusterd-locks.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'xlators/mgmt/glusterd/src/glusterd-locks.c') diff --git a/xlators/mgmt/glusterd/src/glusterd-locks.c b/xlators/mgmt/glusterd/src/glusterd-locks.c index 0703777bdcb..c86dc8069da 100644 --- a/xlators/mgmt/glusterd/src/glusterd-locks.c +++ b/xlators/mgmt/glusterd/src/glusterd-locks.c @@ -26,7 +26,7 @@ #include -#define GF_MAX_LOCKING_ENTITIES 2 +#define GF_MAX_LOCKING_ENTITIES 3 /* Valid entities that the mgmt_v3 lock can hold locks upon * * To add newer entities to be locked, we can just add more * @@ -34,6 +34,7 @@ glusterd_valid_entities valid_types[] = { { "vol", _gf_true }, { "snap", _gf_false }, + { "global", _gf_false}, { NULL }, }; -- cgit