diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-16 22:09:29 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-16 22:09:29 -0800 |
| commit | 2bb4646fce8d09916b351d1a62f98db7cec6fc41 (patch) | |
| tree | c1f0d002e69868606eca9d1b919835f422892063 /fs/ocfs2/dlm/dlmast.c | |
| parent | 6836b9bdd98e3b500cd49512484df68f46e14659 (diff) | |
| parent | b0483e78e5c4c9871fc5541875b3bc006846d46b (diff) | |
| download | op-kernel-dev-2bb4646fce8d09916b351d1a62f98db7cec6fc41.zip op-kernel-dev-2bb4646fce8d09916b351d1a62f98db7cec6fc41.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'fs/ocfs2/dlm/dlmast.c')
| -rw-r--r-- | fs/ocfs2/dlm/dlmast.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/dlm/dlmast.c b/fs/ocfs2/dlm/dlmast.c index 01cf8cc..dccc439 100644 --- a/fs/ocfs2/dlm/dlmast.c +++ b/fs/ocfs2/dlm/dlmast.c @@ -123,7 +123,7 @@ static void __dlm_queue_ast(struct dlm_ctxt *dlm, struct dlm_lock *lock) dlm_lock_put(lock); /* free up the reserved bast that we are cancelling. * guaranteed that this will not be the last reserved - * ast because *both* an ast and a bast were reserved + * ast because *both* an ast and a bast were reserved * to get to this point. the res->spinlock will not be * taken here */ dlm_lockres_release_ast(dlm, res); |
