2009-01-12 13:43:39 +03:00
|
|
|
/*
|
|
|
|
* Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
|
|
|
|
* Copyright (C) 2004-2009 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
|
|
|
|
* of the GNU General Public License version 2.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/fs.h>
|
|
|
|
#include <linux/dlm.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 11:04:11 +03:00
|
|
|
#include <linux/slab.h>
|
2009-01-12 13:43:39 +03:00
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/gfs2_ondisk.h>
|
|
|
|
|
|
|
|
#include "incore.h"
|
|
|
|
#include "glock.h"
|
|
|
|
#include "util.h"
|
|
|
|
|
|
|
|
|
|
|
|
static void gdlm_ast(void *arg)
|
|
|
|
{
|
|
|
|
struct gfs2_glock *gl = arg;
|
|
|
|
unsigned ret = gl->gl_state;
|
|
|
|
|
|
|
|
BUG_ON(gl->gl_lksb.sb_flags & DLM_SBF_DEMOTED);
|
|
|
|
|
|
|
|
if (gl->gl_lksb.sb_flags & DLM_SBF_VALNOTVALID)
|
|
|
|
memset(gl->gl_lvb, 0, GDLM_LVB_SIZE);
|
|
|
|
|
|
|
|
switch (gl->gl_lksb.sb_status) {
|
|
|
|
case -DLM_EUNLOCK: /* Unlocked, so glock can be freed */
|
2011-03-09 13:58:04 +03:00
|
|
|
gfs2_glock_free(gl);
|
2009-01-12 13:43:39 +03:00
|
|
|
return;
|
|
|
|
case -DLM_ECANCEL: /* Cancel while getting lock */
|
|
|
|
ret |= LM_OUT_CANCELED;
|
|
|
|
goto out;
|
|
|
|
case -EAGAIN: /* Try lock fails */
|
2010-09-08 13:09:25 +04:00
|
|
|
case -EDEADLK: /* Deadlock detected */
|
2009-01-12 13:43:39 +03:00
|
|
|
goto out;
|
2010-09-08 13:09:25 +04:00
|
|
|
case -ETIMEDOUT: /* Canceled due to timeout */
|
2009-01-12 13:43:39 +03:00
|
|
|
ret |= LM_OUT_ERROR;
|
|
|
|
goto out;
|
|
|
|
case 0: /* Success */
|
|
|
|
break;
|
|
|
|
default: /* Something unexpected */
|
|
|
|
BUG();
|
|
|
|
}
|
|
|
|
|
GFS2: Fix locking bug in failed shared to exclusive conversion
After calling out to the dlm, GFS2 sets the new state of a glock to
gl_target in gdlm_ast(). However, gl_target is not always the lock
state that was requested. If a conversion from shared to exclusive
fails, finish_xmote() will call do_xmote() with LM_ST_UNLOCKED, instead
of gl->gl_target, so that it can reacquire the lock in exlusive the next
time around. In this case, setting the lock to gl_target in gdlm_ast()
will make GFS2 think that it has the glock in exclusive mode, when
really, it doesn't have the glock locked at all. This patch adds a new
field to the gfs2_glock structure, gl_req, to track the mode that was
requested.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2009-03-06 19:03:20 +03:00
|
|
|
ret = gl->gl_req;
|
2009-01-12 13:43:39 +03:00
|
|
|
if (gl->gl_lksb.sb_flags & DLM_SBF_ALTMODE) {
|
GFS2: Fix locking bug in failed shared to exclusive conversion
After calling out to the dlm, GFS2 sets the new state of a glock to
gl_target in gdlm_ast(). However, gl_target is not always the lock
state that was requested. If a conversion from shared to exclusive
fails, finish_xmote() will call do_xmote() with LM_ST_UNLOCKED, instead
of gl->gl_target, so that it can reacquire the lock in exlusive the next
time around. In this case, setting the lock to gl_target in gdlm_ast()
will make GFS2 think that it has the glock in exclusive mode, when
really, it doesn't have the glock locked at all. This patch adds a new
field to the gfs2_glock structure, gl_req, to track the mode that was
requested.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2009-03-06 19:03:20 +03:00
|
|
|
if (gl->gl_req == LM_ST_SHARED)
|
2009-01-12 13:43:39 +03:00
|
|
|
ret = LM_ST_DEFERRED;
|
GFS2: Fix locking bug in failed shared to exclusive conversion
After calling out to the dlm, GFS2 sets the new state of a glock to
gl_target in gdlm_ast(). However, gl_target is not always the lock
state that was requested. If a conversion from shared to exclusive
fails, finish_xmote() will call do_xmote() with LM_ST_UNLOCKED, instead
of gl->gl_target, so that it can reacquire the lock in exlusive the next
time around. In this case, setting the lock to gl_target in gdlm_ast()
will make GFS2 think that it has the glock in exclusive mode, when
really, it doesn't have the glock locked at all. This patch adds a new
field to the gfs2_glock structure, gl_req, to track the mode that was
requested.
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
2009-03-06 19:03:20 +03:00
|
|
|
else if (gl->gl_req == LM_ST_DEFERRED)
|
2009-01-12 13:43:39 +03:00
|
|
|
ret = LM_ST_SHARED;
|
|
|
|
else
|
|
|
|
BUG();
|
|
|
|
}
|
|
|
|
|
|
|
|
set_bit(GLF_INITIAL, &gl->gl_flags);
|
|
|
|
gfs2_glock_complete(gl, ret);
|
|
|
|
return;
|
|
|
|
out:
|
|
|
|
if (!test_bit(GLF_INITIAL, &gl->gl_flags))
|
|
|
|
gl->gl_lksb.sb_lkid = 0;
|
|
|
|
gfs2_glock_complete(gl, ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void gdlm_bast(void *arg, int mode)
|
|
|
|
{
|
|
|
|
struct gfs2_glock *gl = arg;
|
|
|
|
|
|
|
|
switch (mode) {
|
|
|
|
case DLM_LOCK_EX:
|
|
|
|
gfs2_glock_cb(gl, LM_ST_UNLOCKED);
|
|
|
|
break;
|
|
|
|
case DLM_LOCK_CW:
|
|
|
|
gfs2_glock_cb(gl, LM_ST_DEFERRED);
|
|
|
|
break;
|
|
|
|
case DLM_LOCK_PR:
|
|
|
|
gfs2_glock_cb(gl, LM_ST_SHARED);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
printk(KERN_ERR "unknown bast mode %d", mode);
|
|
|
|
BUG();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* convert gfs lock-state to dlm lock-mode */
|
|
|
|
|
|
|
|
static int make_mode(const unsigned int lmstate)
|
|
|
|
{
|
|
|
|
switch (lmstate) {
|
|
|
|
case LM_ST_UNLOCKED:
|
|
|
|
return DLM_LOCK_NL;
|
|
|
|
case LM_ST_EXCLUSIVE:
|
|
|
|
return DLM_LOCK_EX;
|
|
|
|
case LM_ST_DEFERRED:
|
|
|
|
return DLM_LOCK_CW;
|
|
|
|
case LM_ST_SHARED:
|
|
|
|
return DLM_LOCK_PR;
|
|
|
|
}
|
|
|
|
printk(KERN_ERR "unknown LM state %d", lmstate);
|
|
|
|
BUG();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static u32 make_flags(const u32 lkid, const unsigned int gfs_flags,
|
|
|
|
const int req)
|
|
|
|
{
|
|
|
|
u32 lkf = 0;
|
|
|
|
|
|
|
|
if (gfs_flags & LM_FLAG_TRY)
|
|
|
|
lkf |= DLM_LKF_NOQUEUE;
|
|
|
|
|
|
|
|
if (gfs_flags & LM_FLAG_TRY_1CB) {
|
|
|
|
lkf |= DLM_LKF_NOQUEUE;
|
|
|
|
lkf |= DLM_LKF_NOQUEUEBAST;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (gfs_flags & LM_FLAG_PRIORITY) {
|
|
|
|
lkf |= DLM_LKF_NOORDER;
|
|
|
|
lkf |= DLM_LKF_HEADQUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (gfs_flags & LM_FLAG_ANY) {
|
|
|
|
if (req == DLM_LOCK_PR)
|
|
|
|
lkf |= DLM_LKF_ALTCW;
|
|
|
|
else if (req == DLM_LOCK_CW)
|
|
|
|
lkf |= DLM_LKF_ALTPR;
|
|
|
|
else
|
|
|
|
BUG();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (lkid != 0)
|
|
|
|
lkf |= DLM_LKF_CONVERT;
|
|
|
|
|
|
|
|
lkf |= DLM_LKF_VALBLK;
|
|
|
|
|
|
|
|
return lkf;
|
|
|
|
}
|
|
|
|
|
2010-11-29 15:50:38 +03:00
|
|
|
static int gdlm_lock(struct gfs2_glock *gl, unsigned int req_state,
|
|
|
|
unsigned int flags)
|
2009-01-12 13:43:39 +03:00
|
|
|
{
|
|
|
|
struct lm_lockstruct *ls = &gl->gl_sbd->sd_lockstruct;
|
|
|
|
int req;
|
|
|
|
u32 lkf;
|
|
|
|
|
|
|
|
req = make_mode(req_state);
|
|
|
|
lkf = make_flags(gl->gl_lksb.sb_lkid, flags, req);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Submit the actual lock request.
|
|
|
|
*/
|
|
|
|
|
2010-11-29 15:50:38 +03:00
|
|
|
return dlm_lock(ls->ls_dlm, req, &gl->gl_lksb, lkf, gl->gl_strname,
|
|
|
|
GDLM_STRNAME_BYTES - 1, 0, gdlm_ast, gl, gdlm_bast);
|
2009-01-12 13:43:39 +03:00
|
|
|
}
|
|
|
|
|
2011-01-19 12:30:01 +03:00
|
|
|
static void gdlm_put_lock(struct gfs2_glock *gl)
|
2009-01-12 13:43:39 +03:00
|
|
|
{
|
2010-01-25 14:20:19 +03:00
|
|
|
struct gfs2_sbd *sdp = gl->gl_sbd;
|
|
|
|
struct lm_lockstruct *ls = &sdp->sd_lockstruct;
|
2009-01-12 13:43:39 +03:00
|
|
|
int error;
|
|
|
|
|
|
|
|
if (gl->gl_lksb.sb_lkid == 0) {
|
2011-03-09 13:58:04 +03:00
|
|
|
gfs2_glock_free(gl);
|
2009-01-12 13:43:39 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
error = dlm_unlock(ls->ls_dlm, gl->gl_lksb.sb_lkid, DLM_LKF_VALBLK,
|
|
|
|
NULL, gl);
|
|
|
|
if (error) {
|
|
|
|
printk(KERN_ERR "gdlm_unlock %x,%llx err=%d\n",
|
|
|
|
gl->gl_name.ln_type,
|
|
|
|
(unsigned long long)gl->gl_name.ln_number, error);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void gdlm_cancel(struct gfs2_glock *gl)
|
|
|
|
{
|
|
|
|
struct lm_lockstruct *ls = &gl->gl_sbd->sd_lockstruct;
|
|
|
|
dlm_unlock(ls->ls_dlm, gl->gl_lksb.sb_lkid, DLM_LKF_CANCEL, NULL, gl);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int gdlm_mount(struct gfs2_sbd *sdp, const char *fsname)
|
|
|
|
{
|
|
|
|
struct lm_lockstruct *ls = &sdp->sd_lockstruct;
|
|
|
|
int error;
|
|
|
|
|
|
|
|
if (fsname == NULL) {
|
|
|
|
fs_info(sdp, "no fsname found\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2011-11-02 23:30:58 +04:00
|
|
|
error = dlm_new_lockspace(fsname, NULL,
|
2009-01-12 13:43:39 +03:00
|
|
|
DLM_LSFL_FS | DLM_LSFL_NEWEXCL |
|
|
|
|
(ls->ls_nodir ? DLM_LSFL_NODIR : 0),
|
2011-11-02 23:30:58 +04:00
|
|
|
GDLM_LVB_SIZE, NULL, NULL, NULL, &ls->ls_dlm);
|
2009-01-12 13:43:39 +03:00
|
|
|
if (error)
|
|
|
|
printk(KERN_ERR "dlm_new_lockspace error %d", error);
|
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void gdlm_unmount(struct gfs2_sbd *sdp)
|
|
|
|
{
|
|
|
|
struct lm_lockstruct *ls = &sdp->sd_lockstruct;
|
|
|
|
|
|
|
|
if (ls->ls_dlm) {
|
|
|
|
dlm_release_lockspace(ls->ls_dlm, 2);
|
|
|
|
ls->ls_dlm = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static const match_table_t dlm_tokens = {
|
|
|
|
{ Opt_jid, "jid=%d"},
|
|
|
|
{ Opt_id, "id=%d"},
|
|
|
|
{ Opt_first, "first=%d"},
|
|
|
|
{ Opt_nodir, "nodir=%d"},
|
|
|
|
{ Opt_err, NULL },
|
|
|
|
};
|
|
|
|
|
|
|
|
const struct lm_lockops gfs2_dlm_ops = {
|
|
|
|
.lm_proto_name = "lock_dlm",
|
|
|
|
.lm_mount = gdlm_mount,
|
|
|
|
.lm_unmount = gdlm_unmount,
|
|
|
|
.lm_put_lock = gdlm_put_lock,
|
|
|
|
.lm_lock = gdlm_lock,
|
|
|
|
.lm_cancel = gdlm_cancel,
|
|
|
|
.lm_tokens = &dlm_tokens,
|
|
|
|
};
|
|
|
|
|