Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02d6d685 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Frederic Weisbecker
Browse files

logfs: kill BKL 



logfs does not need the BKL, so use ->unlocked_ioctl instead
of ->ioctl in file operations.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarJoern Engel <joern@logfs.org>
[ fixed trivial conflict ]
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
parent 2be1f3a7

fs/logfs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -824,7 +824,7 @@ const struct inode_operations logfs_dir_iops = { 
};

const struct file_operations logfs_dir_fops = {

	.fsync		= logfs_fsync,

	.ioctl		= logfs_ioctl,

	.unlocked_ioctl	= logfs_ioctl,

	.readdir	= logfs_readdir,

	.read		= generic_read_dir,

};

fs/logfs/file.c

+3 −3
Original line number Diff line number Diff line
@@ -181,9 +181,9 @@ static int logfs_releasepage(struct page *page, gfp_t only_xfs_uses_this) 
}





int logfs_ioctl(struct inode *inode, struct file *file, unsigned int cmd,

		unsigned long arg)

long logfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

	struct inode *inode = file->f_path.dentry->d_inode;

	struct logfs_inode *li = logfs_inode(inode);

	unsigned int oldflags, flags;

	int err;
@@ -255,7 +255,7 @@ const struct file_operations logfs_reg_fops = { 
	.aio_read	= generic_file_aio_read,

	.aio_write	= generic_file_aio_write,

	.fsync		= logfs_fsync,

	.ioctl		= logfs_ioctl,

	.unlocked_ioctl	= logfs_ioctl,

	.llseek		= generic_file_llseek,

	.mmap		= generic_file_readonly_mmap,

	.open		= generic_file_open,

fs/logfs/logfs.h

+1 −2
Original line number Diff line number Diff line
@@ -504,8 +504,7 @@ extern const struct inode_operations logfs_reg_iops; 
extern const struct file_operations logfs_reg_fops;

extern const struct address_space_operations logfs_reg_aops;

int logfs_readpage(struct file *file, struct page *page);

int logfs_ioctl(struct inode *inode, struct file *file, unsigned int cmd,

		unsigned long arg);

long logfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);

int logfs_fsync(struct file *file, int datasync);



/* gc.c */