fs: dlm: remove unused is_granted function

[PATCH] fs: dlm: remove unused is_granted function

Posted by Tom Rix 1 year, 1 month ago

clang with W=1 reports
fs/dlm/lock.c:239:19: error: unused function
  'is_granted' [-Werror,-Wunused-function]
static inline int is_granted(struct dlm_lkb *lkb)
                  ^
This function is not used so remove it.

Signed-off-by: Tom Rix <trix@redhat.com>
---
 fs/dlm/lock.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index 1582c8b1404c..b9c124b88f15 100644
--- a/fs/dlm/lock.c
+++ b/fs/dlm/lock.c
@@ -236,11 +236,6 @@ static inline int is_altmode(struct dlm_lkb *lkb)
 	return test_bit(DLM_SBF_ALTMODE_BIT, &lkb->lkb_sbflags);
 }
 
-static inline int is_granted(struct dlm_lkb *lkb)
-{
-	return (lkb->lkb_status == DLM_LKSTS_GRANTED);
-}
-
 static inline int is_remote(struct dlm_rsb *r)
 {
 	DLM_ASSERT(r->res_nodeid >= 0, dlm_print_rsb(r););
-- 
2.27.0

Re: [PATCH] fs: dlm: remove unused is_granted function

Posted by Nick Desaulniers 1 year ago

On Fri, Mar 24, 2023 at 10:59 AM Tom Rix <trix@redhat.com> wrote:
>
> clang with W=1 reports
> fs/dlm/lock.c:239:19: error: unused function
>   'is_granted' [-Werror,-Wunused-function]
> static inline int is_granted(struct dlm_lkb *lkb)
>                   ^
> This function is not used so remove it.

How about instead of remove it, we see if we can reuse it?
Grep for DLM_LKSTS_GRANTED. The comparisons on:

2668: if (lkb->lkb_status != DLM_LKSTS_GRANTED)
2787: if (lkb->lkb_status == DLM_LKSTS_GRANTED &&
3749: if (lkb->lkb_status != DLM_LKSTS_GRANTED)

all look like they ought to.


>
> Signed-off-by: Tom Rix <trix@redhat.com>
> ---
>  fs/dlm/lock.c | 5 -----
>  1 file changed, 5 deletions(-)
>
> diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
> index 1582c8b1404c..b9c124b88f15 100644
> --- a/fs/dlm/lock.c
> +++ b/fs/dlm/lock.c
> @@ -236,11 +236,6 @@ static inline int is_altmode(struct dlm_lkb *lkb)
>         return test_bit(DLM_SBF_ALTMODE_BIT, &lkb->lkb_sbflags);
>  }
>
> -static inline int is_granted(struct dlm_lkb *lkb)
> -{
> -       return (lkb->lkb_status == DLM_LKSTS_GRANTED);
> -}
> -
>  static inline int is_remote(struct dlm_rsb *r)
>  {
>         DLM_ASSERT(r->res_nodeid >= 0, dlm_print_rsb(r););
> --
> 2.27.0
>


-- 
Thanks,
~Nick Desaulniers