dlm: allow multiple lockspace creates
Subsystems (2)
David Teigland
maintainerPATCH 1/6 dlm: allow multiple lockspace creates
Add a count for lockspace create and release so that create can be called multiple times to use the lockspace from different places. Also add the new flag DLM_LSFL_NEWEXCL to create a lockspace with the previous behavior of returning -EEXIST if the lockspace already exists.
Signed-off-by David Teigland <[email protected]>
--- fs/dlm/dlm_internal.h | 6 ++- fs/dlm/lockspace.c | 107 ++++++++++++++++++++++++++++--------------- fs/dlm/user.c | 54 +++++++++++++-------- fs/dlm/user.h | 3 +- fs/gfs2/locking/dlm/mount.c | 3 +- include/linux/dlm.h | 5 ++- include/linux/dlm_device.h | 2 +- 7 files changed, 116 insertions(+), 64 deletions(-)
fs/dlm/dlm_internal.h +4 -2
@@ -2,7 +2,7 @@ ******************************************************************************* ** ** Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. -** Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. +** Copyright (C) 2004-2008 Red Hat, Inc. All rights reserved. ** ** This copyrighted material is made available to anyone wishing to use, ** modify, copy, or redistribute it subject to the terms and conditions
@@ -441,7 +441,9 @@ struct dlm_ls {uint32_t ls_global_id;/* global unique lockspace ID */ uint32_t ls_exflags;int ls_lvblen; -int ls_count;/* reference count */ +int ls_count;/* refcount of processes in +the dlm using this ls */ +int ls_create_count;/* create/release refcount */ unsigned long ls_flags;/* LSFL_ */ struct kobject ls_kobj;
fs/dlm/lockspace.c +70 -37
189 lines not on this page · raw message
fs/dlm/user.c +33 -21
92 lines not on this page · raw message
fs/dlm/user.h +2 -1
@@ -1,5 +1,5 @@/* -* Copyright (C) 2006 Red Hat, Inc. All rights reserved. +* Copyright (C) 2006-2008 Red Hat, Inc. All rights reserved. * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions
@@ -12,5 +12,6 @@void dlm_user_add_ast (struct dlm_lkb *lkb,int type);int dlm_user_init (void );void dlm_user_exit (void ); +int dlm_device_deregister (struct dlm_ls *ls);#endif
fs/gfs2/locking/dlm/mount.c +2 -1
@@ -144,7 +144,8 @@ static int gdlm_mount(char *table_name, char *host_data, error =dlm_new_lockspace (ls->fsname,strlen (ls->fsname), &ls->dlm_lockspace, -DLM_LSFL_FS | (nodir ?DLM_LSFL_NODIR :0 ), +DLM_LSFL_FS |DLM_LSFL_NEWEXCL | + (nodir ?DLM_LSFL_NODIR :0 ),GDLM_LVB_SIZE );if (error) {log_error ("dlm_new_lockspace error %d" , error);
include/linux/dlm.h +4 -1
@@ -2,7 +2,7 @@ ******************************************************************************* ** ** Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. -** Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. +** Copyright (C) 2004-2008 Red Hat, Inc. All rights reserved. ** ** This copyrighted material is made available to anyone wishing to use, ** modify, copy, or redistribute it subject to the terms and conditions
@@ -65,9 +65,12 @@ struct dlm_lksb {char * sb_lvbptr; }; +/* dlm_new_lockspace() flags */ +#define DLM_LSFL_NODIR 0x00000001#define DLM_LSFL_TIMEWARN 0x00000002#define DLM_LSFL_FS 0x00000004 +#define DLM_LSFL_NEWEXCL 0x00000008#ifdef __KERNEL__
include/linux/dlm_device.h +1 -1
@@ -26,7 +26,7 @@/* Version of the device interface */ #define DLM_DEVICE_VERSION_MAJOR 6#define DLM_DEVICE_VERSION_MINOR 0 -#define DLM_DEVICE_VERSION_PATCH 0 +#define DLM_DEVICE_VERSION_PATCH 1/* struct passed to the lock write */ struct dlm_lock_params {
Signature · 1 line
1.5.5.1