mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
gfs2: 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-9-c6129007ee8d@kernel.org Reviewed-by: NeilBrown <neilb@suse.de> Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
parent
11ff73082f
commit
b4c6d52d8a
1 changed files with 4 additions and 4 deletions
|
@ -1443,7 +1443,7 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)
|
|||
if (!(fl->fl_flags & FL_POSIX))
|
||||
return -ENOLCK;
|
||||
if (gfs2_withdrawing_or_withdrawn(sdp)) {
|
||||
if (fl->fl_type == F_UNLCK)
|
||||
if (lock_is_unlock(fl))
|
||||
locks_lock_file_wait(file, fl);
|
||||
return -EIO;
|
||||
}
|
||||
|
@ -1451,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 (lock_is_unlock(fl))
|
||||
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);
|
||||
|
@ -1483,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 = (lock_is_write(fl)) ? LM_ST_EXCLUSIVE : LM_ST_SHARED;
|
||||
flags = GL_EXACT | GL_NOPID;
|
||||
if (!IS_SETLKW(cmd))
|
||||
flags |= LM_FLAG_TRY_1CB;
|
||||
|
@ -1560,7 +1560,7 @@ static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl)
|
|||
if (!(fl->fl_flags & FL_FLOCK))
|
||||
return -ENOLCK;
|
||||
|
||||
if (fl->fl_type == F_UNLCK) {
|
||||
if (lock_is_unlock(fl)) {
|
||||
do_unflock(file, fl);
|
||||
return 0;
|
||||
} else {
|
||||
|
|
Loading…
Reference in a new issue