[PATCH v2 33/41] gfs2: adapt to breakup of struct file_lock

[Jeff Layton]

Most of the existing APIs have remained the same, but subsystems that
access file_lock fields directly need to reach into struct
file_lock_core now.

Signed-off-by: Jeff Layton <jlay...@kernel.org>
---
 fs/gfs2/file.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 9e7cd054e924..dc0c4f7d7cc7 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -15,7 +15,6 @@
 #include <linux/mm.h>
 #include <linux/mount.h>
 #include <linux/fs.h>
-#define _NEED_FILE_LOCK_FIELD_MACROS
 #include <linux/filelock.h>
 #include <linux/gfs2_ondisk.h>
 #include <linux/falloc.h>
@@ -1441,10 +1440,10 @@ static int gfs2_lock(struct file *file, int cmd, struct 
file_lock *fl)
        struct gfs2_sbd *sdp = GFS2_SB(file->f_mapping->host);
        struct lm_lockstruct *ls = &sdp->sd_lockstruct;
 
-       if (!(fl->fl_flags & FL_POSIX))
+       if (!(fl->fl_core.flc_flags & FL_POSIX))
                return -ENOLCK;
        if (gfs2_withdrawing_or_withdrawn(sdp)) {
-               if (fl->fl_type == F_UNLCK)
+               if (fl->fl_core.flc_type == F_UNLCK)
                        locks_lock_file_wait(file, fl);
                return -EIO;
        }
@@ -1452,7 +1451,7 @@ static int gfs2_lock(struct file *file, int cmd, struct 
file_lock *fl)
                return dlm_posix_cancel(ls->ls_dlm, ip->i_no_addr, file, fl);
        else if (IS_GETLK(cmd))
                return dlm_posix_get(ls->ls_dlm, ip->i_no_addr, file, fl);
-       else if (fl->fl_type == F_UNLCK)
+       else if (fl->fl_core.flc_type == F_UNLCK)
                return dlm_posix_unlock(ls->ls_dlm, ip->i_no_addr, file, fl);
        else
                return dlm_posix_lock(ls->ls_dlm, ip->i_no_addr, file, cmd, fl);
@@ -1484,7 +1483,7 @@ static int do_flock(struct file *file, int cmd, struct 
file_lock *fl)
        int error = 0;
        int sleeptime;
 
-       state = (fl->fl_type == F_WRLCK) ? LM_ST_EXCLUSIVE : LM_ST_SHARED;
+       state = (fl->fl_core.flc_type == F_WRLCK) ? LM_ST_EXCLUSIVE : 
LM_ST_SHARED;
        flags = GL_EXACT | GL_NOPID;
        if (!IS_SETLKW(cmd))
                flags |= LM_FLAG_TRY_1CB;
@@ -1496,8 +1495,8 @@ static int do_flock(struct file *file, int cmd, struct 
file_lock *fl)
                if (fl_gh->gh_state == state)
                        goto out;
                locks_init_lock(&request);
-               request.fl_type = F_UNLCK;
-               request.fl_flags = FL_FLOCK;
+               request.fl_core.flc_type = F_UNLCK;
+               request.fl_core.flc_flags = FL_FLOCK;
                locks_lock_file_wait(file, &request);
                gfs2_glock_dq(fl_gh);
                gfs2_holder_reinit(state, flags, fl_gh);
@@ -1558,10 +1557,10 @@ static void do_unflock(struct file *file, struct 
file_lock *fl)
 
 static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl)
 {
-       if (!(fl->fl_flags & FL_FLOCK))
+       if (!(fl->fl_core.flc_flags & FL_FLOCK))
                return -ENOLCK;
 
-       if (fl->fl_type == F_UNLCK) {
+       if (fl->fl_core.flc_type == F_UNLCK) {
                do_unflock(file, fl);
                return 0;
        } else {

-- 
2.43.0