diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 21:00:37 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 21:00:37 +0000 |
| commit | 94ac2ab3fff96814d7460a27a0e9d004abbd4128 (patch) | |
| tree | 9a4eb8cc234b540b0f4b93363109cdd37a20540b /fs/dlm/ast.c | |
| parent | Adding debian version 6.8.12-1. (diff) | |
| download | linux-94ac2ab3fff96814d7460a27a0e9d004abbd4128.tar.xz linux-94ac2ab3fff96814d7460a27a0e9d004abbd4128.zip | |
Merging upstream version 6.9.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'fs/dlm/ast.c')
| -rw-r--r-- | fs/dlm/ast.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/fs/dlm/ast.c b/fs/dlm/ast.c index decedc4ee1..1f2f70a1b8 100644 --- a/fs/dlm/ast.c +++ b/fs/dlm/ast.c @@ -12,7 +12,6 @@ #include <trace/events/dlm.h> #include "dlm_internal.h" -#include "lvb_table.h" #include "memory.h" #include "lock.h" #include "user.h" @@ -43,7 +42,6 @@ int dlm_enqueue_lkb_callback(struct dlm_lkb *lkb, uint32_t flags, int mode, struct dlm_ls *ls = lkb->lkb_resource->res_ls; int rv = DLM_ENQUEUE_CALLBACK_SUCCESS; struct dlm_callback *cb; - int copy_lvb = 0; int prev_mode; if (flags & DLM_CB_BAST) { @@ -75,17 +73,6 @@ int dlm_enqueue_lkb_callback(struct dlm_lkb *lkb, uint32_t flags, int mode, goto out; } } - } else if (flags & DLM_CB_CAST) { - if (test_bit(DLM_DFL_USER_BIT, &lkb->lkb_dflags)) { - if (lkb->lkb_last_cast) - prev_mode = lkb->lkb_last_cb->mode; - else - prev_mode = -1; - - if (!status && lkb->lkb_lksb->sb_lvbptr && - dlm_lvb_operations[prev_mode + 1][mode + 1]) - copy_lvb = 1; - } } cb = dlm_allocate_cb(); @@ -98,7 +85,6 @@ int dlm_enqueue_lkb_callback(struct dlm_lkb *lkb, uint32_t flags, int mode, cb->mode = mode; cb->sb_status = status; cb->sb_flags = (sbflags & 0x000000FF); - cb->copy_lvb = copy_lvb; kref_init(&cb->ref); if (!test_and_set_bit(DLM_IFL_CB_PENDING_BIT, &lkb->lkb_iflags)) rv = DLM_ENQUEUE_CALLBACK_NEED_SCHED; |