Commit 575a7e0f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'locks-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux 

Pull file locking updates from Jeff Layton:
 "The main change here is that I've broken out most of the file locking
  definitions into a new header file. I also went ahead and completed
  the removal of locks_inode function"

* tag 'locks-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
  fs: remove locks_inode
  filelock: move file locking definitions to separate header file
parents 219ac97a c65454a9

arch/arm/kernel/sys_oabi-compat.c

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
#include <linux/syscalls.h>

#include <linux/errno.h>

#include <linux/fs.h>

#include <linux/filelock.h>

#include <linux/cred.h>

#include <linux/fcntl.h>

#include <linux/eventpoll.h>

fs/9p/vfs_file.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/module.h>

#include <linux/errno.h>

#include <linux/fs.h>

#include <linux/filelock.h>

#include <linux/sched.h>

#include <linux/file.h>

#include <linux/stat.h>

fs/afs/flock.c

+7 −7
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ static int afs_do_setlk_check(struct afs_vnode *vnode, struct key *key, 
 */

static int afs_do_setlk(struct file *file, struct file_lock *fl)

{

	struct inode *inode = locks_inode(file);

	struct inode *inode = file_inode(file);

	struct afs_vnode *vnode = AFS_FS_I(inode);

	enum afs_flock_mode mode = AFS_FS_S(inode->i_sb)->flock_mode;

	afs_lock_type_t type;
@@ -701,7 +701,7 @@ static int afs_do_setlk(struct file *file, struct file_lock *fl) 
 */

static int afs_do_unlk(struct file *file, struct file_lock *fl)

{

	struct afs_vnode *vnode = AFS_FS_I(locks_inode(file));

	struct afs_vnode *vnode = AFS_FS_I(file_inode(file));

	int ret;



	_enter("{%llx:%llu},%u", vnode->fid.vid, vnode->fid.vnode, fl->fl_type);
@@ -721,7 +721,7 @@ static int afs_do_unlk(struct file *file, struct file_lock *fl) 
 */

static int afs_do_getlk(struct file *file, struct file_lock *fl)

{

	struct afs_vnode *vnode = AFS_FS_I(locks_inode(file));

	struct afs_vnode *vnode = AFS_FS_I(file_inode(file));

	struct key *key = afs_file_key(file);

	int ret, lock_count;
@@ -763,7 +763,7 @@ static int afs_do_getlk(struct file *file, struct file_lock *fl) 
 */

int afs_lock(struct file *file, int cmd, struct file_lock *fl)

{

	struct afs_vnode *vnode = AFS_FS_I(locks_inode(file));

	struct afs_vnode *vnode = AFS_FS_I(file_inode(file));

	enum afs_flock_operation op;

	int ret;
@@ -798,7 +798,7 @@ int afs_lock(struct file *file, int cmd, struct file_lock *fl) 
 */

int afs_flock(struct file *file, int cmd, struct file_lock *fl)

{

	struct afs_vnode *vnode = AFS_FS_I(locks_inode(file));

	struct afs_vnode *vnode = AFS_FS_I(file_inode(file));

	enum afs_flock_operation op;

	int ret;
@@ -843,7 +843,7 @@ int afs_flock(struct file *file, int cmd, struct file_lock *fl) 
 */

static void afs_fl_copy_lock(struct file_lock *new, struct file_lock *fl)

{

	struct afs_vnode *vnode = AFS_FS_I(locks_inode(fl->fl_file));

	struct afs_vnode *vnode = AFS_FS_I(file_inode(fl->fl_file));



	_enter("");
@@ -861,7 +861,7 @@ static void afs_fl_copy_lock(struct file_lock *new, struct file_lock *fl) 
 */

static void afs_fl_release_private(struct file_lock *fl)

{

	struct afs_vnode *vnode = AFS_FS_I(locks_inode(fl->fl_file));

	struct afs_vnode *vnode = AFS_FS_I(file_inode(fl->fl_file));



	_enter("");

fs/afs/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/kernel.h>

#include <linux/ktime.h>

#include <linux/fs.h>

#include <linux/filelock.h>

#include <linux/pagemap.h>

#include <linux/rxrpc.h>

#include <linux/key.h>

fs/attr.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/capability.h>

#include <linux/fsnotify.h>

#include <linux/fcntl.h>

#include <linux/filelock.h>

#include <linux/security.h>

#include <linux/evm.h>

#include <linux/ima.h>