[PATCH v2 08/41] afs: rename fl_type variable in afs_next_locker

[Jeff Layton]

In later patches we're going to introduce macros that conflict with the
variable name here. Rename it.

Signed-off-by: Jeff Layton <jlay...@kernel.org>
---
 fs/afs/flock.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/afs/flock.c b/fs/afs/flock.c
index 9c6dea3139f5..e7feaf66bddf 100644
--- a/fs/afs/flock.c
+++ b/fs/afs/flock.c
@@ -112,16 +112,16 @@ static void afs_next_locker(struct afs_vnode *vnode, int 
error)
 {
        struct file_lock *p, *_p, *next = NULL;
        struct key *key = vnode->lock_key;
-       unsigned int fl_type = F_RDLCK;
+       unsigned int type = F_RDLCK;
 
        _enter("");
 
        if (vnode->lock_type == AFS_LOCK_WRITE)
-               fl_type = F_WRLCK;
+               type = F_WRLCK;
 
        list_for_each_entry_safe(p, _p, &vnode->pending_locks, fl_u.afs.link) {
                if (error &&
-                   p->fl_type == fl_type &&
+                   p->fl_type == type &&
                    afs_file_key(p->fl_file) == key) {
                        list_del_init(&p->fl_u.afs.link);
                        p->fl_u.afs.state = error;

-- 
2.43.0