locks: Remove unused conf argument from lm_grant
This argument is always NULL so don't pass it around. [jlayton: remove dependencies on previous patches in series] Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Jeff Layton <jlayton@primarydata.com>
This commit is contained in:
parent
f39b913cee
commit
d0449b90f8
3 changed files with 8 additions and 14 deletions
|
@ -30,7 +30,7 @@ struct plock_op {
|
|||
|
||||
struct plock_xop {
|
||||
struct plock_op xop;
|
||||
void *callback;
|
||||
int (*callback)(struct file_lock *fl, int result);
|
||||
void *fl;
|
||||
void *file;
|
||||
struct file_lock flc;
|
||||
|
@ -190,7 +190,7 @@ static int dlm_plock_callback(struct plock_op *op)
|
|||
struct file *file;
|
||||
struct file_lock *fl;
|
||||
struct file_lock *flc;
|
||||
int (*notify)(void *, void *, int) = NULL;
|
||||
int (*notify)(struct file_lock *fl, int result) = NULL;
|
||||
struct plock_xop *xop = (struct plock_xop *)op;
|
||||
int rv = 0;
|
||||
|
||||
|
@ -209,7 +209,7 @@ static int dlm_plock_callback(struct plock_op *op)
|
|||
notify = xop->callback;
|
||||
|
||||
if (op->info.rv) {
|
||||
notify(fl, NULL, op->info.rv);
|
||||
notify(fl, op->info.rv);
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
@ -228,7 +228,7 @@ static int dlm_plock_callback(struct plock_op *op)
|
|||
(unsigned long long)op->info.number, file, fl);
|
||||
}
|
||||
|
||||
rv = notify(fl, NULL, 0);
|
||||
rv = notify(fl, 0);
|
||||
if (rv) {
|
||||
/* XXX: We need to cancel the fs lock here: */
|
||||
log_print("dlm_plock_callback: lock granted after lock request "
|
||||
|
|
|
@ -667,22 +667,16 @@ nlmsvc_cancel_blocked(struct net *net, struct nlm_file *file, struct nlm_lock *l
|
|||
* deferred rpc for GETLK and SETLK.
|
||||
*/
|
||||
static void
|
||||
nlmsvc_update_deferred_block(struct nlm_block *block, struct file_lock *conf,
|
||||
int result)
|
||||
nlmsvc_update_deferred_block(struct nlm_block *block, int result)
|
||||
{
|
||||
block->b_flags |= B_GOT_CALLBACK;
|
||||
if (result == 0)
|
||||
block->b_granted = 1;
|
||||
else
|
||||
block->b_flags |= B_TIMED_OUT;
|
||||
if (conf) {
|
||||
if (block->b_fl)
|
||||
__locks_copy_lock(block->b_fl, conf);
|
||||
}
|
||||
}
|
||||
|
||||
static int nlmsvc_grant_deferred(struct file_lock *fl, struct file_lock *conf,
|
||||
int result)
|
||||
static int nlmsvc_grant_deferred(struct file_lock *fl, int result)
|
||||
{
|
||||
struct nlm_block *block;
|
||||
int rc = -ENOENT;
|
||||
|
@ -697,7 +691,7 @@ static int nlmsvc_grant_deferred(struct file_lock *fl, struct file_lock *conf,
|
|||
rc = -ENOLCK;
|
||||
break;
|
||||
}
|
||||
nlmsvc_update_deferred_block(block, conf, result);
|
||||
nlmsvc_update_deferred_block(block, result);
|
||||
} else if (result == 0)
|
||||
block->b_granted = 1;
|
||||
|
||||
|
|
|
@ -869,7 +869,7 @@ struct lock_manager_operations {
|
|||
int (*lm_compare_owner)(struct file_lock *, struct file_lock *);
|
||||
unsigned long (*lm_owner_key)(struct file_lock *);
|
||||
void (*lm_notify)(struct file_lock *); /* unblock callback */
|
||||
int (*lm_grant)(struct file_lock *, struct file_lock *, int);
|
||||
int (*lm_grant)(struct file_lock *, int);
|
||||
void (*lm_break)(struct file_lock *);
|
||||
int (*lm_change)(struct file_lock **, int);
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue