ocfs2: convert to using new filelock helpers

Convert to using the new file locking helper functions.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Link: https://lore.kernel.org/r/20240131-flsplit-v3-13-c6129007ee8d@kernel.org
Reviewed-by: NeilBrown <neilb@suse.de>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/ocfs2/locks.c b/fs/ocfs2/locks.c
index f37174e79fad4f377e76c04eec2a06c5f1f19f89..ef4fd91b586e4a443422387aea4fb86fc37732d0 100644 (file)
--- a/fs/ocfs2/locks.c
+++ b/fs/ocfs2/locks.c
@@ -27,7 +27,7 @@ static int ocfs2_do_flock(struct file *file, struct inode *inode,
        struct ocfs2_file_private *fp = file->private_data;
        struct ocfs2_lock_res *lockres = &fp->fp_flock;
 
-       if (fl->fl_type == F_WRLCK)
+       if (lock_is_write(fl))
                level = 1;
        if (!IS_SETLKW(cmd))
                trylock = 1;
@@ -107,7 +107,7 @@ int ocfs2_flock(struct file *file, int cmd, struct file_lock *fl)
            ocfs2_mount_local(osb))
                return locks_lock_file_wait(file, fl);
 
-       if (fl->fl_type == F_UNLCK)
+       if (lock_is_unlock(fl))
                return ocfs2_do_funlock(file, cmd, fl);
        else
                return ocfs2_do_flock(file, inode, cmd, fl);

diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c
index 9b76ee66aeb2f4f6c4d5f5728e2c303a8a440007..c11406cd87a88e5329d78a8bd252a180d810e361 100644 (file)
--- a/fs/ocfs2/stack_user.c
+++ b/fs/ocfs2/stack_user.c
@@ -744,7 +744,7 @@ static int user_plock(struct ocfs2_cluster_connection *conn,
                return dlm_posix_cancel(conn->cc_lockspace, ino, file, fl);
        else if (IS_GETLK(cmd))
                return dlm_posix_get(conn->cc_lockspace, ino, file, fl);
-       else if (fl->fl_type == F_UNLCK)
+       else if (lock_is_unlock(fl))
                return dlm_posix_unlock(conn->cc_lockspace, ino, file, fl);
        else
                return dlm_posix_lock(conn->cc_lockspace, ino, file, cmd, fl);