Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0449b90 authored by Joe Perches's avatar Joe Perches Committed by Jeff Layton
Browse files

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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJeff Layton <jlayton@primarydata.com>
parent f39b913c

fs/dlm/plock.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ struct plock_op { 




struct plock_xop {

struct plock_xop {

	struct plock_op xop;

	struct plock_op xop;

	void *callback;

	int (*callback)(struct file_lock *fl, int result);

	void *fl;

	void *fl;

	void *file;

	void *file;

	struct file_lock flc;

	struct file_lock flc;
@@ -190,7 +190,7 @@ static int dlm_plock_callback(struct plock_op *op) 
	struct file *file;

	struct file *file;

	struct file_lock *fl;

	struct file_lock *fl;

	struct file_lock *flc;

	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;

	struct plock_xop *xop = (struct plock_xop *)op;

	int rv = 0;

	int rv = 0;
@@ -209,7 +209,7 @@ static int dlm_plock_callback(struct plock_op *op) 
	notify = xop->callback;

	notify = xop->callback;





	if (op->info.rv) {

	if (op->info.rv) {

		notify(fl, NULL, op->info.rv);

		notify(fl, op->info.rv);

		goto out;

		goto out;

	}

	}
@@ -228,7 +228,7 @@ static int dlm_plock_callback(struct plock_op *op) 
			  (unsigned long long)op->info.number, file, fl);

			  (unsigned long long)op->info.number, file, fl);

	}

	}





	rv = notify(fl, NULL, 0);

	rv = notify(fl, 0);

	if (rv) {

	if (rv) {

		/* XXX: We need to cancel the fs lock here: */

		/* XXX: We need to cancel the fs lock here: */

		log_print("dlm_plock_callback: lock granted after lock request "

		log_print("dlm_plock_callback: lock granted after lock request "

fs/lockd/svclock.c

+3 −9
Original line number Original line Diff line number Diff line
@@ -667,22 +667,16 @@ nlmsvc_cancel_blocked(struct net *net, struct nlm_file *file, struct nlm_lock *l 
 * deferred rpc for GETLK and SETLK.

 * deferred rpc for GETLK and SETLK.

 */

 */

static void

static void

nlmsvc_update_deferred_block(struct nlm_block *block, struct file_lock *conf,

nlmsvc_update_deferred_block(struct nlm_block *block, int result)

			     int result)

{

{

	block->b_flags |= B_GOT_CALLBACK;

	block->b_flags |= B_GOT_CALLBACK;

	if (result == 0)

	if (result == 0)

		block->b_granted = 1;

		block->b_granted = 1;

	else

	else

		block->b_flags |= B_TIMED_OUT;

		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,

static int nlmsvc_grant_deferred(struct file_lock *fl, int result)

					int result)

{

{

	struct nlm_block *block;

	struct nlm_block *block;

	int rc = -ENOENT;

	int rc = -ENOENT;
@@ -697,7 +691,7 @@ static int nlmsvc_grant_deferred(struct file_lock *fl, struct file_lock *conf, 
					rc = -ENOLCK;

					rc = -ENOLCK;

					break;

					break;

				}

				}

				nlmsvc_update_deferred_block(block, conf, result);

				nlmsvc_update_deferred_block(block, result);

			} else if (result == 0)

			} else if (result == 0)

				block->b_granted = 1;

				block->b_granted = 1;

include/linux/fs.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -869,7 +869,7 @@ struct lock_manager_operations { 
	int (*lm_compare_owner)(struct file_lock *, struct file_lock *);

	int (*lm_compare_owner)(struct file_lock *, struct file_lock *);

	unsigned long (*lm_owner_key)(struct file_lock *);

	unsigned long (*lm_owner_key)(struct file_lock *);

	void (*lm_notify)(struct file_lock *);	/* unblock callback */

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

	void (*lm_break)(struct file_lock *);

	int (*lm_change)(struct file_lock **, int);

	int (*lm_change)(struct file_lock **, int);

};

};