[PATCH v2 06/41] lockd: rename fl_flags and fl_type variables in nlmclnt_lock

[Jeff Layton]

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

Signed-off-by: Jeff Layton <jlay...@kernel.org>
---
 fs/lockd/clntproc.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
index fba6c7fa7474..cc596748e359 100644
--- a/fs/lockd/clntproc.c
+++ b/fs/lockd/clntproc.c
@@ -522,8 +522,8 @@ nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl)
        struct nlm_host *host = req->a_host;
        struct nlm_res  *resp = &req->a_res;
        struct nlm_wait block;
-       unsigned char fl_flags = fl->fl_flags;
-       unsigned char fl_type;
+       unsigned char flags = fl->fl_flags;
+       unsigned char type;
        __be32 b_status;
        int status = -ENOLCK;
 
@@ -533,7 +533,7 @@ nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl)
 
        fl->fl_flags |= FL_ACCESS;
        status = do_vfs_lock(fl);
-       fl->fl_flags = fl_flags;
+       fl->fl_flags = flags;
        if (status < 0)
                goto out;
 
@@ -595,7 +595,7 @@ nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl)
                if (do_vfs_lock(fl) < 0)
                        printk(KERN_WARNING "%s: VFS is out of sync with lock 
manager!\n", __func__);
                up_read(&host->h_rwsem);
-               fl->fl_flags = fl_flags;
+               fl->fl_flags = flags;
                status = 0;
        }
        if (status < 0)
@@ -605,7 +605,7 @@ nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl)
         * cases NLM_LCK_DENIED is returned for a permanent error.  So
         * turn it into an ENOLCK.
         */
-       if (resp->status == nlm_lck_denied && (fl_flags & FL_SLEEP))
+       if (resp->status == nlm_lck_denied && (flags & FL_SLEEP))
                status = -ENOLCK;
        else
                status = nlm_stat_to_errno(resp->status);
@@ -622,13 +622,13 @@ nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl)
                           req->a_host->h_addrlen, req->a_res.status);
        dprintk("lockd: lock attempt ended in fatal error.\n"
                "       Attempting to unlock.\n");
-       fl_type = fl->fl_type;
+       type = fl->fl_type;
        fl->fl_type = F_UNLCK;
        down_read(&host->h_rwsem);
        do_vfs_lock(fl);
        up_read(&host->h_rwsem);
-       fl->fl_type = fl_type;
-       fl->fl_flags = fl_flags;
+       fl->fl_type = type;
+       fl->fl_flags = flags;
        nlmclnt_async_call(cred, req, NLMPROC_UNLOCK, &nlmclnt_unlock_ops);
        return status;
 }
@@ -683,7 +683,7 @@ nlmclnt_unlock(struct nlm_rqst *req, struct file_lock *fl)
        struct nlm_host *host = req->a_host;
        struct nlm_res  *resp = &req->a_res;
        int status;
-       unsigned char fl_flags = fl->fl_flags;
+       unsigned char flags = fl->fl_flags;
 
        /*
         * Note: the server is supposed to either grant us the unlock
@@ -694,7 +694,7 @@ nlmclnt_unlock(struct nlm_rqst *req, struct file_lock *fl)
        down_read(&host->h_rwsem);
        status = do_vfs_lock(fl);
        up_read(&host->h_rwsem);
-       fl->fl_flags = fl_flags;
+       fl->fl_flags = flags;
        if (status == -ENOENT) {
                status = 0;
                goto out;

-- 
2.43.0