Commit 8d614a44 authored by Alexander Aring's avatar Alexander Aring Committed by David Teigland
Browse files

fs: dlm: remove timeout from dlm_user_adopt_orphan 



Remove the unused timeout parameter from dlm_user_adopt_orphan().

Signed-off-by: default avatarAlexander Aring <aahringo@redhat.com>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent 2bb2a3d6

fs/dlm/lock.c

+1 −1
Original line number Diff line number Diff line
@@ -5886,7 +5886,7 @@ int dlm_user_convert(struct dlm_ls *ls, struct dlm_user_args *ua_tmp, 


int dlm_user_adopt_orphan(struct dlm_ls *ls, struct dlm_user_args *ua_tmp,

		     int mode, uint32_t flags, void *name, unsigned int namelen,

		     unsigned long timeout_cs, uint32_t *lkid)

		     uint32_t *lkid)

{

	struct dlm_lkb *lkb = NULL, *iter;

	struct dlm_user_args *ua;

fs/dlm/lock.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ int dlm_user_convert(struct dlm_ls *ls, struct dlm_user_args *ua_tmp, 
	unsigned long timeout_cs);

int dlm_user_adopt_orphan(struct dlm_ls *ls, struct dlm_user_args *ua_tmp,

	int mode, uint32_t flags, void *name, unsigned int namelen,

	unsigned long timeout_cs, uint32_t *lkid);

	uint32_t *lkid);

int dlm_user_unlock(struct dlm_ls *ls, struct dlm_user_args *ua_tmp,

	uint32_t flags, uint32_t lkid, char *lvb_in);

int dlm_user_cancel(struct dlm_ls *ls,  struct dlm_user_args *ua_tmp,

fs/dlm/user.c

+0 −1
Original line number Diff line number Diff line
@@ -270,7 +270,6 @@ static int device_user_lock(struct dlm_user_proc *proc, 
		error = dlm_user_adopt_orphan(ls, ua,

					 params->mode, params->flags,

					 params->name, params->namelen,

					 (unsigned long) params->timeout,

					 &lkid);

		if (!error)

			error = lkid;