diff options
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/dlm/lock.c | 2 | ||||
| -rw-r--r-- | fs/dlm/lock.h | 2 | ||||
| -rw-r--r-- | fs/dlm/user.c | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index 080cd216a9a4..12d4cc742308 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c @@ -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; diff --git a/fs/dlm/lock.h b/fs/dlm/lock.h index 40781d9a24df..8c99e1b6eefa 100644 --- a/fs/dlm/lock.h +++ b/fs/dlm/lock.h @@ -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, diff --git a/fs/dlm/user.c b/fs/dlm/user.c index 1060b24f18d4..4b2a24a6a15d 100644 --- a/fs/dlm/user.c +++ b/fs/dlm/user.c @@ -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; |