Skip to content

Commit

Permalink
ocfs2: Remove ->unblock lockres operation
Browse files Browse the repository at this point in the history 
Have ocfs2_process_blocked_lock() call ocfs2_generic_unblock_lock(), which
gets to be ocfs2_unblock_lock() now that it's the only possible unblock
function.

Remove the ->unblock() callback from the structure, and all lock type
specific unblock functions.

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
  • Loading branch information
Mark Fasheh committed Sep 24, 2006
1 parent cc567d8 commit b5e500e
Showing 1 changed file with 6 additions and 146 deletions.
152 changes: 6 additions & 146 deletions fs/ocfs2/dlmglue.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ static struct ocfs2_super *ocfs2_get_inode_osb(struct ocfs2_lock_res *lockres);
/*
* Return value from ->downconvert_worker functions.
*
* These control the precise actions of ocfs2_generic_unblock_lock()
* These control the precise actions of ocfs2_unblock_lock()
* and ocfs2_process_blocked_lock()
*
*/
Expand All @@ -90,31 +90,19 @@ struct ocfs2_unblock_ctl {
enum ocfs2_unblock_action unblock_action;
};

static int ocfs2_unblock_meta(struct ocfs2_lock_res *lockres,
struct ocfs2_unblock_ctl *ctl);
static int ocfs2_check_meta_downconvert(struct ocfs2_lock_res *lockres,
int new_level);
static void ocfs2_set_meta_lvb(struct ocfs2_lock_res *lockres);

static int ocfs2_unblock_data(struct ocfs2_lock_res *lockres,
struct ocfs2_unblock_ctl *ctl);
static int ocfs2_data_convert_worker(struct ocfs2_lock_res *lockres,
int blocking);

static int ocfs2_unblock_inode_lock(struct ocfs2_lock_res *lockres,
struct ocfs2_unblock_ctl *ctl);

static int ocfs2_unblock_dentry_lock(struct ocfs2_lock_res *lockres,
struct ocfs2_unblock_ctl *ctl);
static int ocfs2_dentry_convert_worker(struct ocfs2_lock_res *lockres,
int blocking);

static void ocfs2_dentry_post_unlock(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres);

static int ocfs2_unblock_osb_lock(struct ocfs2_lock_res *lockres,
struct ocfs2_unblock_ctl *ctl);

/*
* OCFS2 Lock Resource Operations
*
Expand All @@ -126,7 +114,7 @@ struct ocfs2_lock_res_ops {
* this callback if ->l_priv is not an ocfs2_super pointer
*/
struct ocfs2_super * (*get_osb)(struct ocfs2_lock_res *);
int (*unblock)(struct ocfs2_lock_res *, struct ocfs2_unblock_ctl *);

void (*post_unlock)(struct ocfs2_super *, struct ocfs2_lock_res *);

/*
Expand Down Expand Up @@ -186,44 +174,34 @@ struct ocfs2_lock_res_ops {
*/
#define LOCK_TYPE_USES_LVB 0x2

static int ocfs2_generic_unblock_lock(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres,
struct ocfs2_unblock_ctl *ctl);

static struct ocfs2_lock_res_ops ocfs2_inode_rw_lops = {
.get_osb = ocfs2_get_inode_osb,
.unblock = ocfs2_unblock_inode_lock,
.flags = 0,
};

static struct ocfs2_lock_res_ops ocfs2_inode_meta_lops = {
.get_osb = ocfs2_get_inode_osb,
.unblock = ocfs2_unblock_meta,
.check_downconvert = ocfs2_check_meta_downconvert,
.set_lvb = ocfs2_set_meta_lvb,
.flags = LOCK_TYPE_REQUIRES_REFRESH|LOCK_TYPE_USES_LVB,
};

static struct ocfs2_lock_res_ops ocfs2_inode_data_lops = {
.get_osb = ocfs2_get_inode_osb,
.unblock = ocfs2_unblock_data,
.downconvert_worker = ocfs2_data_convert_worker,
.flags = 0,
};

static struct ocfs2_lock_res_ops ocfs2_super_lops = {
.unblock = ocfs2_unblock_osb_lock,
.flags = LOCK_TYPE_REQUIRES_REFRESH,
};

static struct ocfs2_lock_res_ops ocfs2_rename_lops = {
.unblock = ocfs2_unblock_osb_lock,
.flags = 0,
};

static struct ocfs2_lock_res_ops ocfs2_dentry_lops = {
.get_osb = ocfs2_get_dentry_osb,
.unblock = ocfs2_unblock_dentry_lock,
.post_unlock = ocfs2_dentry_post_unlock,
.downconvert_worker = ocfs2_dentry_convert_worker,
.flags = 0,
Expand Down Expand Up @@ -2553,9 +2531,9 @@ static int ocfs2_cancel_convert(struct ocfs2_super *osb,
return ret;
}

static int ocfs2_generic_unblock_lock(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres,
struct ocfs2_unblock_ctl *ctl)
static int ocfs2_unblock_lock(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres,
struct ocfs2_unblock_ctl *ctl)
{
unsigned long flags;
int blocking;
Expand Down Expand Up @@ -2694,53 +2672,6 @@ static int ocfs2_data_convert_worker(struct ocfs2_lock_res *lockres,
return UNBLOCK_CONTINUE;
}

int ocfs2_unblock_data(struct ocfs2_lock_res *lockres,
struct ocfs2_unblock_ctl *ctl)
{
int status;
struct inode *inode;
struct ocfs2_super *osb;

mlog_entry_void();

inode = ocfs2_lock_res_inode(lockres);
osb = OCFS2_SB(inode->i_sb);

mlog(0, "unblock inode %llu\n",
(unsigned long long)OCFS2_I(inode)->ip_blkno);

status = ocfs2_generic_unblock_lock(osb, lockres, ctl);
if (status < 0)
mlog_errno(status);

mlog(0, "inode %llu, requeue = %d\n",
(unsigned long long)OCFS2_I(inode)->ip_blkno, ctl->requeue);

mlog_exit(status);
return status;
}

static int ocfs2_unblock_inode_lock(struct ocfs2_lock_res *lockres,
struct ocfs2_unblock_ctl *ctl)
{
int status;
struct inode *inode;

mlog_entry_void();

mlog(0, "Unblock lockres %s\n", lockres->l_name);

inode = ocfs2_lock_res_inode(lockres);

status = ocfs2_generic_unblock_lock(OCFS2_SB(inode->i_sb),
lockres, ctl);
if (status < 0)
mlog_errno(status);

mlog_exit(status);
return status;
}

static int ocfs2_check_meta_downconvert(struct ocfs2_lock_res *lockres,
int new_level)
{
Expand All @@ -2764,31 +2695,6 @@ static void ocfs2_set_meta_lvb(struct ocfs2_lock_res *lockres)
__ocfs2_stuff_meta_lvb(inode);
}

static int ocfs2_unblock_meta(struct ocfs2_lock_res *lockres,
struct ocfs2_unblock_ctl *ctl)
{
int status;
struct inode *inode;

mlog_entry_void();

inode = ocfs2_lock_res_inode(lockres);

mlog(0, "unblock inode %llu\n",
(unsigned long long)OCFS2_I(inode)->ip_blkno);

status = ocfs2_generic_unblock_lock(OCFS2_SB(inode->i_sb),
lockres, ctl);
if (status < 0)
mlog_errno(status);

mlog(0, "inode %llu, requeue = %d\n",
(unsigned long long)OCFS2_I(inode)->ip_blkno, ctl->requeue);

mlog_exit(status);
return status;
}

/*
* Does the final reference drop on our dentry lock. Right now this
* happens in the vote thread, but we could choose to simplify the
Expand Down Expand Up @@ -2911,51 +2817,6 @@ static int ocfs2_dentry_convert_worker(struct ocfs2_lock_res *lockres,
return UNBLOCK_CONTINUE_POST;
}

static int ocfs2_unblock_dentry_lock(struct ocfs2_lock_res *lockres,
struct ocfs2_unblock_ctl *ctl)
{
int ret;
struct ocfs2_dentry_lock *dl = ocfs2_lock_res_dl(lockres);
struct ocfs2_super *osb = OCFS2_SB(dl->dl_inode->i_sb);

mlog(0, "unblock dentry lock: %llu\n",
(unsigned long long)OCFS2_I(dl->dl_inode)->ip_blkno);

ret = ocfs2_generic_unblock_lock(osb,
lockres,
ctl);
if (ret < 0)
mlog_errno(ret);

mlog(0, "requeue = %d, post = %d\n", ctl->requeue, ctl->unblock_action);

return ret;
}

/* Generic unblock function for any lockres whose private data is an
* ocfs2_super pointer. */
static int ocfs2_unblock_osb_lock(struct ocfs2_lock_res *lockres,
struct ocfs2_unblock_ctl *ctl)
{
int status;
struct ocfs2_super *osb;

mlog_entry_void();

mlog(0, "Unblock lockres %s\n", lockres->l_name);

osb = ocfs2_get_lockres_osb(lockres);

status = ocfs2_generic_unblock_lock(osb,
lockres,
ctl);
if (status < 0)
mlog_errno(status);

mlog_exit(status);
return status;
}

void ocfs2_process_blocked_lock(struct ocfs2_super *osb,
struct ocfs2_lock_res *lockres)
{
Expand All @@ -2971,7 +2832,6 @@ void ocfs2_process_blocked_lock(struct ocfs2_super *osb,

BUG_ON(!lockres);
BUG_ON(!lockres->l_ops);
BUG_ON(!lockres->l_ops->unblock);

mlog(0, "lockres %s blocked.\n", lockres->l_name);

Expand All @@ -2985,7 +2845,7 @@ void ocfs2_process_blocked_lock(struct ocfs2_super *osb,
goto unqueue;
spin_unlock_irqrestore(&lockres->l_lock, flags);

status = lockres->l_ops->unblock(lockres, &ctl);
status = ocfs2_unblock_lock(osb, lockres, &ctl);
if (status < 0)
mlog_errno(status);

Expand Down

0 comments on commit b5e500e

Please sign in to comment.