[PATCH v2 03/41] dlm: rename fl_flags variable in dlm_posix_unlock

[Jeff Layton]

In later patches we're going to introduce some temporary macros with
names that clash with the variable name here. Rename it.

Signed-off-by: Jeff Layton <jlay...@kernel.org>
---
 fs/dlm/plock.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c
index d814c5121367..1b66b2d2b801 100644
--- a/fs/dlm/plock.c
+++ b/fs/dlm/plock.c
@@ -291,7 +291,7 @@ int dlm_posix_unlock(dlm_lockspace_t *lockspace, u64 
number, struct file *file,
        struct dlm_ls *ls;
        struct plock_op *op;
        int rv;
-       unsigned char fl_flags = fl->fl_flags;
+       unsigned char saved_flags = fl->fl_flags;
 
        ls = dlm_find_lockspace_local(lockspace);
        if (!ls)
@@ -345,7 +345,7 @@ int dlm_posix_unlock(dlm_lockspace_t *lockspace, u64 
number, struct file *file,
        dlm_release_plock_op(op);
 out:
        dlm_put_lockspace(ls);
-       fl->fl_flags = fl_flags;
+       fl->fl_flags = saved_flags;
        return rv;
 }
 EXPORT_SYMBOL_GPL(dlm_posix_unlock);

-- 
2.43.0