aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2010-04-27 16:30:06 -0400
committerFrederic Weisbecker <fweisbec@gmail.com>2010-08-13 18:24:24 -0400
commit02d6d685fc6f2d8b48b133b5a5a43755e005074e (patch)
tree6fb90bda20e1b36494488c067bfedcc655042712
parent2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff)
logfs: kill BKL
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>
-rw-r--r--fs/logfs/dir.c2
-rw-r--r--fs/logfs/file.c6
-rw-r--r--fs/logfs/logfs.h3
3 files changed, 5 insertions, 6 deletions
diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c
index 675cc49197fe..9777eb5b5522 100644
--- a/fs/logfs/dir.c
+++ b/fs/logfs/dir.c
@@ -824,7 +824,7 @@ const struct inode_operations logfs_dir_iops = {
824}; 824};
825const struct file_operations logfs_dir_fops = { 825const struct file_operations logfs_dir_fops = {
826 .fsync = logfs_fsync, 826 .fsync = logfs_fsync,
827 .ioctl = logfs_ioctl, 827 .unlocked_ioctl = logfs_ioctl,
828 .readdir = logfs_readdir, 828 .readdir = logfs_readdir,
829 .read = generic_read_dir, 829 .read = generic_read_dir,
830}; 830};
diff --git a/fs/logfs/file.c b/fs/logfs/file.c
index 4dd0f7c06e39..e86376b87af1 100644
--- a/fs/logfs/file.c
+++ b/fs/logfs/file.c
@@ -181,9 +181,9 @@ static int logfs_releasepage(struct page *page, gfp_t only_xfs_uses_this)
181} 181}
182 182
183 183
184int logfs_ioctl(struct inode *inode, struct file *file, unsigned int cmd, 184long logfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
185 unsigned long arg)
186{ 185{
186 struct inode *inode = file->f_path.dentry->d_inode;
187 struct logfs_inode *li = logfs_inode(inode); 187 struct logfs_inode *li = logfs_inode(inode);
188 unsigned int oldflags, flags; 188 unsigned int oldflags, flags;
189 int err; 189 int err;
@@ -255,7 +255,7 @@ const struct file_operations logfs_reg_fops = {
255 .aio_read = generic_file_aio_read, 255 .aio_read = generic_file_aio_read,
256 .aio_write = generic_file_aio_write, 256 .aio_write = generic_file_aio_write,
257 .fsync = logfs_fsync, 257 .fsync = logfs_fsync,
258 .ioctl = logfs_ioctl, 258 .unlocked_ioctl = logfs_ioctl,
259 .llseek = generic_file_llseek, 259 .llseek = generic_file_llseek,
260 .mmap = generic_file_readonly_mmap, 260 .mmap = generic_file_readonly_mmap,
261 .open = generic_file_open, 261 .open = generic_file_open,
diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h
index 5e3b72077951..b8786264d243 100644
--- a/fs/logfs/logfs.h
+++ b/fs/logfs/logfs.h
@@ -504,8 +504,7 @@ extern const struct inode_operations logfs_reg_iops;
504extern const struct file_operations logfs_reg_fops; 504extern const struct file_operations logfs_reg_fops;
505extern const struct address_space_operations logfs_reg_aops; 505extern const struct address_space_operations logfs_reg_aops;
506int logfs_readpage(struct file *file, struct page *page); 506int logfs_readpage(struct file *file, struct page *page);
507int logfs_ioctl(struct inode *inode, struct file *file, unsigned int cmd, 507long logfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
508 unsigned long arg);
509int logfs_fsync(struct file *file, int datasync); 508int logfs_fsync(struct file *file, int datasync);
510 509
511/* gc.c */ 510/* gc.c */