mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
![Tim Schmielau](/assets/img/avatar_default.png)
After Al Viro (finally) succeeded in removing the sched.h #include in module.h recently, it makes sense again to remove other superfluous sched.h includes. There are quite a lot of files which include it but don't actually need anything defined in there. Presumably these includes were once needed for macros that used to live in sched.h, but moved to other header files in the course of cleaning it up. To ease the pain, this time I did not fiddle with any header files and only removed #includes from .c-files, which tend to cause less trouble. Compile tested against 2.6.20-rc2 and 2.6.20-rc2-mm2 (with offsets) on alpha, arm, i386, ia64, mips, powerpc, and x86_64 with allnoconfig, defconfig, allmodconfig, and allyesconfig as well as a few randconfigs on x86_64 and all configs in arch/arm/configs on arm. I also checked that no new warnings were introduced by the patch (actually, some warnings are removed that were emitted by unnecessarily included header files). Signed-off-by: Tim Schmielau <tim@physik3.uni-rostock.de> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
210 lines
5.6 KiB
C
210 lines
5.6 KiB
C
/*
|
|
* Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
|
|
* Copyright (C) 2004-2006 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/slab.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/completion.h>
|
|
#include <linux/buffer_head.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/gfs2_ondisk.h>
|
|
#include <linux/lm_interface.h>
|
|
|
|
#include "gfs2.h"
|
|
#include "incore.h"
|
|
#include "glock.h"
|
|
#include "lm.h"
|
|
#include "super.h"
|
|
#include "util.h"
|
|
|
|
/**
|
|
* gfs2_lm_mount - mount a locking protocol
|
|
* @sdp: the filesystem
|
|
* @args: mount arguements
|
|
* @silent: if 1, don't complain if the FS isn't a GFS2 fs
|
|
*
|
|
* Returns: errno
|
|
*/
|
|
|
|
int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent)
|
|
{
|
|
char *proto = sdp->sd_proto_name;
|
|
char *table = sdp->sd_table_name;
|
|
int flags = 0;
|
|
int error;
|
|
|
|
if (sdp->sd_args.ar_spectator)
|
|
flags |= LM_MFLAG_SPECTATOR;
|
|
|
|
fs_info(sdp, "Trying to join cluster \"%s\", \"%s\"\n", proto, table);
|
|
|
|
error = gfs2_mount_lockproto(proto, table, sdp->sd_args.ar_hostdata,
|
|
gfs2_glock_cb, sdp,
|
|
GFS2_MIN_LVB_SIZE, flags,
|
|
&sdp->sd_lockstruct, &sdp->sd_kobj);
|
|
if (error) {
|
|
fs_info(sdp, "can't mount proto=%s, table=%s, hostdata=%s\n",
|
|
proto, table, sdp->sd_args.ar_hostdata);
|
|
goto out;
|
|
}
|
|
|
|
if (gfs2_assert_warn(sdp, sdp->sd_lockstruct.ls_lockspace) ||
|
|
gfs2_assert_warn(sdp, sdp->sd_lockstruct.ls_ops) ||
|
|
gfs2_assert_warn(sdp, sdp->sd_lockstruct.ls_lvb_size >=
|
|
GFS2_MIN_LVB_SIZE)) {
|
|
gfs2_unmount_lockproto(&sdp->sd_lockstruct);
|
|
goto out;
|
|
}
|
|
|
|
if (sdp->sd_args.ar_spectator)
|
|
snprintf(sdp->sd_fsname, GFS2_FSNAME_LEN, "%s.s", table);
|
|
else
|
|
snprintf(sdp->sd_fsname, GFS2_FSNAME_LEN, "%s.%u", table,
|
|
sdp->sd_lockstruct.ls_jid);
|
|
|
|
fs_info(sdp, "Joined cluster. Now mounting FS...\n");
|
|
|
|
if ((sdp->sd_lockstruct.ls_flags & LM_LSFLAG_LOCAL) &&
|
|
!sdp->sd_args.ar_ignore_local_fs) {
|
|
sdp->sd_args.ar_localflocks = 1;
|
|
sdp->sd_args.ar_localcaching = 1;
|
|
}
|
|
|
|
out:
|
|
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);
|
|
}
|
|
|
|
void gfs2_lm_unmount(struct gfs2_sbd *sdp)
|
|
{
|
|
if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
|
|
gfs2_unmount_lockproto(&sdp->sd_lockstruct);
|
|
}
|
|
|
|
int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...)
|
|
{
|
|
va_list args;
|
|
|
|
if (test_and_set_bit(SDF_SHUTDOWN, &sdp->sd_flags))
|
|
return 0;
|
|
|
|
va_start(args, fmt);
|
|
vprintk(fmt, args);
|
|
va_end(args);
|
|
|
|
fs_err(sdp, "about to withdraw this file system\n");
|
|
BUG_ON(sdp->sd_args.ar_debug);
|
|
|
|
fs_err(sdp, "telling LM to withdraw\n");
|
|
gfs2_withdraw_lockproto(&sdp->sd_lockstruct);
|
|
fs_err(sdp, "withdrawn\n");
|
|
dump_stack();
|
|
|
|
return -1;
|
|
}
|
|
|
|
int gfs2_lm_get_lock(struct gfs2_sbd *sdp, struct lm_lockname *name,
|
|
void **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;
|
|
}
|
|
|
|
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);
|
|
}
|
|
|
|
unsigned int gfs2_lm_lock(struct gfs2_sbd *sdp, void *lock,
|
|
unsigned int cur_state, unsigned int req_state,
|
|
unsigned int flags)
|
|
{
|
|
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;
|
|
}
|
|
|
|
unsigned int gfs2_lm_unlock(struct gfs2_sbd *sdp, void *lock,
|
|
unsigned int cur_state)
|
|
{
|
|
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;
|
|
}
|
|
|
|
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);
|
|
}
|
|
|
|
int gfs2_lm_hold_lvb(struct gfs2_sbd *sdp, void *lock, char **lvbp)
|
|
{
|
|
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;
|
|
}
|
|
|
|
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);
|
|
}
|
|
|
|
int gfs2_lm_plock_get(struct gfs2_sbd *sdp, struct lm_lockname *name,
|
|
struct file *file, struct file_lock *fl)
|
|
{
|
|
int error = -EIO;
|
|
if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
|
|
error = sdp->sd_lockstruct.ls_ops->lm_plock_get(
|
|
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)
|
|
{
|
|
int error = -EIO;
|
|
if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
|
|
error = sdp->sd_lockstruct.ls_ops->lm_plock(
|
|
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)
|
|
{
|
|
int error = -EIO;
|
|
if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
|
|
error = sdp->sd_lockstruct.ls_ops->lm_punlock(
|
|
sdp->sd_lockstruct.ls_lockspace, name, file, fl);
|
|
return error;
|
|
}
|
|
|
|
void gfs2_lm_recovery_done(struct gfs2_sbd *sdp, unsigned int jid,
|
|
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);
|
|
}
|
|
|