Unverified Commit cdf6c838 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11047 filelock: Correct the filelock owner in fcntl_setlk/fcntl_setlk64 

Merge Pull Request from: @ci-robot 
 
PR sync from: Long Li <leo.lilong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/IRTHQYON4ALVS2HBG6XJAGCGZKSE753G/ 
 
https://gitee.com/openeuler/kernel/issues/IALNC4 
 
Link:https://gitee.com/openeuler/kernel/pulls/11047

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 31e825c6 33c05595

fs/locks.c

+2 −2
Original line number Diff line number Diff line
@@ -2314,7 +2314,7 @@ int fcntl_setlk(unsigned int fd, struct file *filp, unsigned int cmd, 
		f = fcheck(fd);

		spin_unlock(&current->files->file_lock);

		if (f != filp) {

			locks_remove_posix(filp, &current->files);

			locks_remove_posix(filp, current->files);

			error = -EBADF;

		}

	}
@@ -2444,7 +2444,7 @@ int fcntl_setlk64(unsigned int fd, struct file *filp, unsigned int cmd, 
		f = fcheck(fd);

		spin_unlock(&current->files->file_lock);

		if (f != filp) {

			locks_remove_posix(filp, &current->files);

			locks_remove_posix(filp, current->files);

			error = -EBADF;

		}

	}