projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sata_via: style clean up, no indirect method call in LLD
[powerpc.git]
/
fs
/
gfs2
/
lm.c
diff --git
a/fs/gfs2/lm.c
b/fs/gfs2/lm.c
index
cc74422
..
effe4a3
100644
(file)
--- a/
fs/gfs2/lm.c
+++ b/
fs/gfs2/lm.c
@@
-1,10
+1,10
@@
/*
* Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
/*
* Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
- * Copyright (C) 2004-200
5
Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-200
6
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
*
* 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 v
.
2.
+ * of the GNU General Public License v
ersion
2.
*/
#include <linux/sched.h>
*/
#include <linux/sched.h>
@@
-13,12
+13,15
@@
#include <linux/completion.h>
#include <linux/buffer_head.h>
#include <linux/delay.h>
#include <linux/completion.h>
#include <linux/buffer_head.h>
#include <linux/delay.h>
-#include <asm/semaphore.h>
+#include <linux/gfs2_ondisk.h>
+#include <linux/lm_interface.h>
#include "gfs2.h"
#include "gfs2.h"
+#include "incore.h"
#include "glock.h"
#include "lm.h"
#include "super.h"
#include "glock.h"
#include "lm.h"
#include "super.h"
+#include "util.h"
/**
* gfs2_lm_mount - mount a locking protocol
/**
* gfs2_lm_mount - mount a locking protocol
@@
-73,14
+76,15
@@
int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent)
sdp->sd_args.ar_localcaching = 1;
}
sdp->sd_args.ar_localcaching = 1;
}
-
out:
+out:
return error;
}
void gfs2_lm_others_may_mount(struct gfs2_sbd *sdp)
{
if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
return error;
}
void gfs2_lm_others_may_mount(struct gfs2_sbd *sdp)
{
if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
- sdp->sd_lockstruct.ls_ops->lm_others_may_mount(sdp->sd_lockstruct.ls_lockspace);
+ sdp->sd_lockstruct.ls_ops->lm_others_may_mount(
+ sdp->sd_lockstruct.ls_lockspace);
}
void gfs2_lm_unmount(struct gfs2_sbd *sdp)
}
void gfs2_lm_unmount(struct gfs2_sbd *sdp)
@@
-101,8
+105,8
@@
int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...)
va_end(args);
fs_err(sdp, "about to withdraw from the cluster\n");
va_end(args);
fs_err(sdp, "about to withdraw from the cluster\n");
- if (sdp->sd_args.ar_debug)
- BUG();
+ BUG_ON(sdp->sd_args.ar_debug);
+
fs_err(sdp, "waiting for outstanding I/O\n");
fs_err(sdp, "waiting for outstanding I/O\n");
@@
-118,111
+122,88
@@
int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...)
}
int gfs2_lm_get_lock(struct gfs2_sbd *sdp, struct lm_lockname *name,
}
int gfs2_lm_get_lock(struct gfs2_sbd *sdp, struct lm_lockname *name,
-
lm_lock_t
**lockp)
+
void
**lockp)
{
{
- int error;
- if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
- error = -EIO;
- else
- error = sdp->sd_lockstruct.ls_ops->lm_get_lock(sdp->sd_lockstruct.ls_lockspace, name, lockp);
+ int error = -EIO;
+ if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
+ error = sdp->sd_lockstruct.ls_ops->lm_get_lock(
+ sdp->sd_lockstruct.ls_lockspace, name, lockp);
return error;
}
return error;
}
-void gfs2_lm_put_lock(struct gfs2_sbd *sdp,
lm_lock_t
*lock)
+void gfs2_lm_put_lock(struct gfs2_sbd *sdp,
void
*lock)
{
if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
sdp->sd_lockstruct.ls_ops->lm_put_lock(lock);
}
{
if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
sdp->sd_lockstruct.ls_ops->lm_put_lock(lock);
}
-unsigned int gfs2_lm_lock(struct gfs2_sbd *sdp,
lm_lock_t
*lock,
+unsigned int gfs2_lm_lock(struct gfs2_sbd *sdp,
void
*lock,
unsigned int cur_state, unsigned int req_state,
unsigned int flags)
{
unsigned int cur_state, unsigned int req_state,
unsigned int flags)
{
- int ret;
- if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
- ret = 0;
- else
- ret = sdp->sd_lockstruct.ls_ops->lm_lock(lock,
- cur_state,
+ int ret = 0;
+ if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
+ ret = sdp->sd_lockstruct.ls_ops->lm_lock(lock, cur_state,
req_state, flags);
return ret;
}
req_state, flags);
return ret;
}
-unsigned int gfs2_lm_unlock(struct gfs2_sbd *sdp,
lm_lock_t
*lock,
+unsigned int gfs2_lm_unlock(struct gfs2_sbd *sdp,
void
*lock,
unsigned int cur_state)
{
unsigned int cur_state)
{
- int ret;
- if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
- ret = 0;
- else
+ int ret = 0;
+ if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
ret = sdp->sd_lockstruct.ls_ops->lm_unlock(lock, cur_state);
return ret;
}
ret = sdp->sd_lockstruct.ls_ops->lm_unlock(lock, cur_state);
return ret;
}
-void gfs2_lm_cancel(struct gfs2_sbd *sdp,
lm_lock_t
*lock)
+void gfs2_lm_cancel(struct gfs2_sbd *sdp,
void
*lock)
{
if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
sdp->sd_lockstruct.ls_ops->lm_cancel(lock);
}
{
if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
sdp->sd_lockstruct.ls_ops->lm_cancel(lock);
}
-int gfs2_lm_hold_lvb(struct gfs2_sbd *sdp,
lm_lock_t
*lock, char **lvbp)
+int gfs2_lm_hold_lvb(struct gfs2_sbd *sdp,
void
*lock, char **lvbp)
{
{
- int error;
- if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
- error = -EIO;
- else
+ int error = -EIO;
+ if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
error = sdp->sd_lockstruct.ls_ops->lm_hold_lvb(lock, lvbp);
return error;
}
error = sdp->sd_lockstruct.ls_ops->lm_hold_lvb(lock, lvbp);
return error;
}
-void gfs2_lm_unhold_lvb(struct gfs2_sbd *sdp,
lm_lock_t
*lock, char *lvb)
+void gfs2_lm_unhold_lvb(struct gfs2_sbd *sdp,
void
*lock, char *lvb)
{
if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
sdp->sd_lockstruct.ls_ops->lm_unhold_lvb(lock, lvb);
}
{
if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
sdp->sd_lockstruct.ls_ops->lm_unhold_lvb(lock, lvb);
}
-void gfs2_lm_sync_lvb(struct gfs2_sbd *sdp, lm_lock_t *lock, char *lvb)
-{
- if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
- sdp->sd_lockstruct.ls_ops->lm_sync_lvb(lock, lvb);
-}
-
int gfs2_lm_plock_get(struct gfs2_sbd *sdp, struct lm_lockname *name,
struct file *file, struct file_lock *fl)
{
int gfs2_lm_plock_get(struct gfs2_sbd *sdp, struct lm_lockname *name,
struct file *file, struct file_lock *fl)
{
- int error;
- if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
- error = -EIO;
- else
+ int error = -EIO;
+ if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
error = sdp->sd_lockstruct.ls_ops->lm_plock_get(
error = sdp->sd_lockstruct.ls_ops->lm_plock_get(
- sdp->sd_lockstruct.ls_lockspace,
- name, file, fl);
+ sdp->sd_lockstruct.ls_lockspace, name, file, fl);
return error;
}
int gfs2_lm_plock(struct gfs2_sbd *sdp, struct lm_lockname *name,
struct file *file, int cmd, struct file_lock *fl)
{
return error;
}
int gfs2_lm_plock(struct gfs2_sbd *sdp, struct lm_lockname *name,
struct file *file, int cmd, struct file_lock *fl)
{
- int error;
- if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
- error = -EIO;
- else
+ int error = -EIO;
+ if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
error = sdp->sd_lockstruct.ls_ops->lm_plock(
error = sdp->sd_lockstruct.ls_ops->lm_plock(
- sdp->sd_lockstruct.ls_lockspace,
- name, file, cmd, fl);
+ sdp->sd_lockstruct.ls_lockspace, name, file, cmd, fl);
return error;
}
int gfs2_lm_punlock(struct gfs2_sbd *sdp, struct lm_lockname *name,
struct file *file, struct file_lock *fl)
{
return error;
}
int gfs2_lm_punlock(struct gfs2_sbd *sdp, struct lm_lockname *name,
struct file *file, struct file_lock *fl)
{
- int error;
- if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
- error = -EIO;
- else
+ int error = -EIO;
+ if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
error = sdp->sd_lockstruct.ls_ops->lm_punlock(
error = sdp->sd_lockstruct.ls_ops->lm_punlock(
- sdp->sd_lockstruct.ls_lockspace,
- name, file, fl);
+ sdp->sd_lockstruct.ls_lockspace, name, file, fl);
return error;
}
return error;
}
@@
-230,6
+211,7
@@
void gfs2_lm_recovery_done(struct gfs2_sbd *sdp, unsigned int jid,
unsigned int message)
{
if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
unsigned int message)
{
if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
- sdp->sd_lockstruct.ls_ops->lm_recovery_done(sdp->sd_lockstruct.ls_lockspace, jid, message);
+ sdp->sd_lockstruct.ls_ops->lm_recovery_done(
+ sdp->sd_lockstruct.ls_lockspace, jid, message);
}
}