lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

logfs: kill BKL

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

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Joern Engel <joern@logfs.org>
[ fixed trivial conflict ]
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
This commit is contained in:
Arnd Bergmann
2010-04-27 22:30:06 +02:00
committed by Frederic Weisbecker
parent 2be1f3a73d
commit 02d6d685fc
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/logfs/dir.c
View File

@@ -824,7 +824,7 @@ const struct inode_operations logfs_dir_iops = {
}; };
const struct file_operations logfs_dir_fops = { const struct file_operations logfs_dir_fops = {
.fsync = logfs_fsync, .fsync = logfs_fsync,
.ioctl = logfs_ioctl, .unlocked_ioctl = logfs_ioctl,
.readdir = logfs_readdir, .readdir = logfs_readdir,
.read = generic_read_dir, .read = generic_read_dir,
}; };

6
fs/logfs/file.c
View File

@@ -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, long logfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
unsigned long arg)
{ {
struct inode *inode = file->f_path.dentry->d_inode;
struct logfs_inode *li = logfs_inode(inode); struct logfs_inode *li = logfs_inode(inode);
unsigned int oldflags, flags; unsigned int oldflags, flags;
int err; int err;
@@ -255,7 +255,7 @@ const struct file_operations logfs_reg_fops = {
.aio_read = generic_file_aio_read, .aio_read = generic_file_aio_read,
.aio_write = generic_file_aio_write, .aio_write = generic_file_aio_write,
.fsync = logfs_fsync, .fsync = logfs_fsync,
.ioctl = logfs_ioctl, .unlocked_ioctl = logfs_ioctl,
.llseek = generic_file_llseek, .llseek = generic_file_llseek,
.mmap = generic_file_readonly_mmap, .mmap = generic_file_readonly_mmap,
.open = generic_file_open, .open = generic_file_open,

3
fs/logfs/logfs.h
View File

@@ -504,8 +504,7 @@ extern const struct inode_operations logfs_reg_iops;
extern const struct file_operations logfs_reg_fops; extern const struct file_operations logfs_reg_fops;
extern const struct address_space_operations logfs_reg_aops; extern const struct address_space_operations logfs_reg_aops;
int logfs_readpage(struct file *file, struct page *page); int logfs_readpage(struct file *file, struct page *page);
int logfs_ioctl(struct inode *inode, struct file *file, unsigned int cmd, long logfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
unsigned long arg);
int logfs_fsync(struct file *file, int datasync); int logfs_fsync(struct file *file, int datasync);
/* gc.c */ /* gc.c */