Commit da755fdb authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[GFS2] Remove lm.[ch] and distribute content 



The functions in lm.c were just wrappers which were mostly
only used in one other file. By moving the functions to
the files where they are being used, they can be marked
static and also this will usually result in them being inlined
since they are often only used from one point in the code.

A couple of really trivial functions have been inlined by hand
into the function which called them as it makes the code clearer
to do that.

We also gain from one fewer function call in the glock lock and
unlock paths.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent ab0d7566

fs/gfs2/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_GFS2_FS) += gfs2.o

gfs2-y := acl.o bmap.o daemon.o dir.o eaops.o eattr.o glock.o \

	glops.o inode.o lm.o log.o lops.o locking.o main.o meta_io.o \

	glops.o inode.o log.o lops.o locking.o main.o meta_io.o \

	mount.o ops_address.o ops_dentry.o ops_export.o ops_file.o \

	ops_fstype.o ops_inode.o ops_super.o quota.o \

	recovery.o rgrp.o super.o sys.o trans.o util.o

fs/gfs2/glock.c

+47 −4
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include "glock.h"

#include "glops.h"

#include "inode.h"

#include "lm.h"

#include "lops.h"

#include "meta_io.h"

#include "quota.h"
@@ -183,7 +182,8 @@ static void glock_free(struct gfs2_glock *gl) 
	struct gfs2_sbd *sdp = gl->gl_sbd;

	struct inode *aspace = gl->gl_aspace;



	gfs2_lm_put_lock(sdp, gl->gl_lock);

	if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))

		sdp->sd_lockstruct.ls_ops->lm_put_lock(gl->gl_lock);



	if (aspace)

		gfs2_aspace_put(aspace);
@@ -293,6 +293,16 @@ static void glock_work_func(struct work_struct *work) 
	gfs2_glock_put(gl);

}



static 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;

}



/**

 * gfs2_glock_get() - Get a glock, or create one if one doesn't exist

 * @sdp: The GFS2 superblock
@@ -882,6 +892,17 @@ out: 
		gfs2_holder_wake(gh);

}



static 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;

}



/**

 * gfs2_glock_xmote_th - Call into the lock module to acquire or change a glock

 * @gl: The glock in question
@@ -922,6 +943,15 @@ static void gfs2_glock_xmote_th(struct gfs2_glock *gl, struct gfs2_holder *gh) 
		xmote_bh(gl, lck_ret);

}



static 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;

}



/**

 * gfs2_glock_drop_th - call into the lock module to unlock a lock

 * @gl: the glock
@@ -964,6 +994,7 @@ static void gfs2_glock_drop_th(struct gfs2_glock *gl) 
static void do_cancels(struct gfs2_holder *gh)

{

	struct gfs2_glock *gl = gh->gh_gl;

	struct gfs2_sbd *sdp = gl->gl_sbd;



	spin_lock(&gl->gl_spin);
@@ -972,7 +1003,8 @@ static void do_cancels(struct gfs2_holder *gh) 
	       !list_empty(&gh->gh_list)) {

		if (!(gl->gl_req_gh && (gl->gl_req_gh->gh_flags & GL_NOCANCEL))) {

			spin_unlock(&gl->gl_spin);

			gfs2_lm_cancel(gl->gl_sbd, gl->gl_lock);

			if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))

				sdp->sd_lockstruct.ls_ops->lm_cancel(gl->gl_lock);

			msleep(100);

			spin_lock(&gl->gl_spin);

		} else {
@@ -1426,6 +1458,14 @@ void gfs2_glock_dq_uninit_m(unsigned int num_gh, struct gfs2_holder *ghs) 
		gfs2_glock_dq_uninit(&ghs[x]);

}



static 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;

}



/**

 * gfs2_lvb_hold - attach a LVB from a glock

 * @gl: The glock in question
@@ -1461,12 +1501,15 @@ int gfs2_lvb_hold(struct gfs2_glock *gl) 


void gfs2_lvb_unhold(struct gfs2_glock *gl)

{

	struct gfs2_sbd *sdp = gl->gl_sbd;



	gfs2_glock_hold(gl);

	gfs2_glmutex_lock(gl);



	gfs2_assert(gl->gl_sbd, atomic_read(&gl->gl_lvb_count) > 0);

	if (atomic_dec_and_test(&gl->gl_lvb_count)) {

		gfs2_lm_unhold_lvb(gl->gl_sbd, gl->gl_lock, gl->gl_lvb);

		if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))

			sdp->sd_lockstruct.ls_ops->lm_unhold_lvb(gl->gl_lock, gl->gl_lvb);

		gl->gl_lvb = NULL;

		gfs2_glock_put(gl);

	}

fs/gfs2/incore.h

+2 −0
Original line number Diff line number Diff line
@@ -211,6 +211,8 @@ struct gfs2_glock { 
	struct delayed_work gl_work;

};



#define GFS2_MIN_LVB_SIZE 32	/* Min size of LVB that gfs2 supports */



struct gfs2_alloc {

	/* Quota stuff */

fs/gfs2/lm.c

deleted100644 → 0
+0 −210
Original line number Diff line number Diff line 
/*

 * 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);

}

fs/gfs2/lm.h

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
/*

 * 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.

 */



#ifndef __LM_DOT_H__

#define __LM_DOT_H__



struct gfs2_sbd;



#define GFS2_MIN_LVB_SIZE 32



int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent);

void gfs2_lm_others_may_mount(struct gfs2_sbd *sdp);

void gfs2_lm_unmount(struct gfs2_sbd *sdp);

int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...)

				__attribute__ ((format(printf, 2, 3)));

int gfs2_lm_get_lock(struct gfs2_sbd *sdp, struct lm_lockname *name,

		     void **lockp);

void gfs2_lm_put_lock(struct gfs2_sbd *sdp, void *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 gfs2_lm_unlock(struct gfs2_sbd *sdp, void *lock,

			   unsigned int cur_state);

void gfs2_lm_cancel(struct gfs2_sbd *sdp, void *lock);

int gfs2_lm_hold_lvb(struct gfs2_sbd *sdp, void *lock, char **lvbp);

void gfs2_lm_unhold_lvb(struct gfs2_sbd *sdp, void *lock, char *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(struct gfs2_sbd *sdp, struct lm_lockname *name,

		  struct file *file, int cmd, struct file_lock *fl);

int gfs2_lm_punlock(struct gfs2_sbd *sdp, struct lm_lockname *name,

		    struct file *file, struct file_lock *fl);

void gfs2_lm_recovery_done(struct gfs2_sbd *sdp, unsigned int jid,

			   unsigned int message);



#endif /* __LM_DOT_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE