Merge tag 'iomap-6.4-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux-block.git] / fs / dlm / user.c

diff --git a/fs/dlm/user.c b/fs/dlm/user.c
index 35129505ddda128102ad7b18490a02e60fc0759a..d9c09fc0aba11ab5edfe251b1c3b9c8d92b6b200 100644 (file)
--- a/fs/dlm/user.c
+++ b/fs/dlm/user.c
@@ -183,7 +183,8 @@ void dlm_user_add_ast(struct dlm_lkb *lkb, uint32_t flags, int mode,
        struct dlm_user_proc *proc;
        int rv;
 
-       if (lkb->lkb_flags & (DLM_IFL_ORPHAN | DLM_IFL_DEAD))
+       if (test_bit(DLM_DFL_ORPHAN_BIT, &lkb->lkb_dflags) ||
+           test_bit(DLM_IFL_DEAD_BIT, &lkb->lkb_iflags))
                return;
 
        ls = lkb->lkb_resource->res_ls;
@@ -195,7 +196,8 @@ void dlm_user_add_ast(struct dlm_lkb *lkb, uint32_t flags, int mode,
           for cases where a completion ast is received for an operation that
           began before clear_proc_locks did its cancel/unlock. */
 
-       if (lkb->lkb_flags & (DLM_IFL_ORPHAN | DLM_IFL_DEAD))
+       if (test_bit(DLM_DFL_ORPHAN_BIT, &lkb->lkb_dflags) ||
+           test_bit(DLM_IFL_DEAD_BIT, &lkb->lkb_iflags))
                goto out;
 
        DLM_ASSERT(lkb->lkb_ua, dlm_print_lkb(lkb););
@@ -206,7 +208,7 @@ void dlm_user_add_ast(struct dlm_lkb *lkb, uint32_t flags, int mode,
                goto out;
 
        if ((flags & DLM_CB_CAST) && lkb_is_endoflife(mode, status))
-               lkb->lkb_flags |= DLM_IFL_ENDOFLIFE;
+               set_bit(DLM_IFL_ENDOFLIFE_BIT, &lkb->lkb_iflags);
 
        spin_lock(&proc->asts_spin);
 
@@ -229,7 +231,7 @@ void dlm_user_add_ast(struct dlm_lkb *lkb, uint32_t flags, int mode,
        }
        spin_unlock(&proc->asts_spin);
 
-       if (lkb->lkb_flags & DLM_IFL_ENDOFLIFE) {
+       if (test_bit(DLM_IFL_ENDOFLIFE_BIT, &lkb->lkb_iflags)) {
                /* N.B. spin_lock locks_spin, not asts_spin */
                spin_lock(&proc->locks_spin);
                if (!list_empty(&lkb->lkb_ownqueue)) {
@@ -259,14 +261,6 @@ static int device_user_lock(struct dlm_user_proc *proc,
                goto out;
        }
 
-#ifdef CONFIG_DLM_DEPRECATED_API
-       if (params->timeout)
-               pr_warn_once("========================================================\n"
-                            "WARNING: the lkb timeout feature is being deprecated and\n"
-                            "         will be removed in v6.2!\n"
-                            "========================================================\n");
-#endif
-
        ua = kzalloc(sizeof(struct dlm_user_args), GFP_NOFS);
        if (!ua)
                goto out;
@@ -279,16 +273,9 @@ static int device_user_lock(struct dlm_user_proc *proc,
        ua->xid = params->xid;
 
        if (params->flags & DLM_LKF_CONVERT) {
-#ifdef CONFIG_DLM_DEPRECATED_API
-               error = dlm_user_convert(ls, ua,
-                                        params->mode, params->flags,
-                                        params->lkid, params->lvb,
-                                        (unsigned long) params->timeout);
-#else
                error = dlm_user_convert(ls, ua,
                                         params->mode, params->flags,
                                         params->lkid, params->lvb);
-#endif
        } else if (params->flags & DLM_LKF_ORPHAN) {
                error = dlm_user_adopt_orphan(ls, ua,
                                         params->mode, params->flags,
@@ -297,16 +284,9 @@ static int device_user_lock(struct dlm_user_proc *proc,
                if (!error)
                        error = lkid;
        } else {
-#ifdef CONFIG_DLM_DEPRECATED_API
-               error = dlm_user_request(ls, ua,
-                                        params->mode, params->flags,
-                                        params->name, params->namelen,
-                                        (unsigned long) params->timeout);
-#else
                error = dlm_user_request(ls, ua,
                                         params->mode, params->flags,
                                         params->name, params->namelen);
-#endif
                if (!error)
                        error = ua->lksb.sb_lkid;
        }
@@ -884,7 +864,7 @@ static ssize_t device_read(struct file *file, char __user *buf, size_t count,
                goto try_another;
        case DLM_DEQUEUE_CALLBACK_LAST:
                list_del_init(&lkb->lkb_cb_list);
-               lkb->lkb_flags &= ~DLM_IFL_CB_PENDING;
+               clear_bit(DLM_IFL_CB_PENDING_BIT, &lkb->lkb_iflags);
                break;
        case DLM_DEQUEUE_CALLBACK_SUCCESS:
                break;