aboutsummaryrefslogtreecommitdiffstats
path: root/fs/dlm/lockspace.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/dlm/lockspace.c')
-rw-r--r--fs/dlm/lockspace.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
index 6802653473d1..1dc72105ab12 100644
--- a/fs/dlm/lockspace.c
+++ b/fs/dlm/lockspace.c
@@ -438,17 +438,18 @@ static int new_lockspace(char *name, int namelen, void **lockspace,
438 ls->ls_count = 0; 438 ls->ls_count = 0;
439 ls->ls_flags = 0; 439 ls->ls_flags = 0;
440 440
441 /* ls_exflags are forced to match among nodes, and we don't
442 need to require all nodes to have TIMEWARN active */
443 if (flags & DLM_LSFL_TIMEWARN) 441 if (flags & DLM_LSFL_TIMEWARN)
444 set_bit(LSFL_TIMEWARN, &ls->ls_flags); 442 set_bit(LSFL_TIMEWARN, &ls->ls_flags);
445 ls->ls_exflags = (flags & ~DLM_LSFL_TIMEWARN);
446 443
447 if (flags & DLM_LSFL_FS) 444 if (flags & DLM_LSFL_FS)
448 ls->ls_allocation = GFP_NOFS; 445 ls->ls_allocation = GFP_NOFS;
449 else 446 else
450 ls->ls_allocation = GFP_KERNEL; 447 ls->ls_allocation = GFP_KERNEL;
451 448
449 /* ls_exflags are forced to match among nodes, and we don't
450 need to require all nodes to have TIMEWARN or FS set */
451 ls->ls_exflags = (flags & ~(DLM_LSFL_TIMEWARN | DLM_LSFL_FS));
452
452 size = dlm_config.ci_rsbtbl_size; 453 size = dlm_config.ci_rsbtbl_size;
453 ls->ls_rsbtbl_size = size; 454 ls->ls_rsbtbl_size = size;
454 455