Skip to contentSkip to conversation

ext3: remove the BKL in ext3/ioctl.c

PATCH New [email protected] 1 participant 1 message Apr 2, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 34/166 ext3: remove the BKL in ext3/ioctl.c

From: Cyrus Massoumi <[email protected]>

Reformat ext3/ioctl.c to make it look more like ext4/ioctl.c and remove the BKL around ext3_ioctl().

---

 fs/ext3/dir.c           |    2 -
 fs/ext3/file.c          |    2 -
 fs/ext3/ioctl.c         |   59 ++++++++++++--------------------------
 include/linux/ext3_fs.h |    5 +--
 4 files changed, 24 insertions(+), 44 deletions(-)
fs/ext3/dir.c renamed from fs/ext3/dir.c~ext3-remove-the-bkl-in-ext3-ioctlc +1 -1
diff -puN fs/ext3/dir.c~ext3-remove-the-bkl-in-ext3-ioctlc fs/ext3/dir.c
@@ -42,7 +42,7 @@ const struct file_operations ext3_dir_op
 	.llseek		= generic_file_llseek,
 	.read		= generic_read_dir,
 	.readdir	= ext3_readdir,		/* we take BKL. needed?*/
-	.ioctl		= ext3_ioctl,		/* BKL held */
+	.unlocked_ioctl	= ext3_ioctl,
 #ifdef CONFIG_COMPAT
 	.compat_ioctl	= ext3_compat_ioctl,
 #endif
fs/ext3/file.c renamed from fs/ext3/file.c~ext3-remove-the-bkl-in-ext3-ioctlc +1 -1
diff -puN fs/ext3/file.c~ext3-remove-the-bkl-in-ext3-ioctlc fs/ext3/file.c
@@ -112,7 +112,7 @@ const struct file_operations ext3_file_o
 	.write		= do_sync_write,
 	.aio_read	= generic_file_aio_read,
 	.aio_write	= ext3_file_write,
-	.ioctl		= ext3_ioctl,
+	.unlocked_ioctl	= ext3_ioctl,
 #ifdef CONFIG_COMPAT
 	.compat_ioctl	= ext3_compat_ioctl,
 #endif
fs/ext3/ioctl.c renamed from fs/ext3/ioctl.c~ext3-remove-the-bkl-in-ext3-ioctlc +20 -39

134 lines not on this page · raw message

include/linux/ext3_fs.h renamed from include/linux/ext3_fs.h~ext3-remove-the-bkl-in-ext3-ioctlc +2 -3
diff -puN include/linux/ext3_fs.h~ext3-remove-the-bkl-in-ext3-ioctlc include/linux/ext3_fs.h
@@ -893,9 +893,8 @@ extern int ext3_fiemap(struct inode *ino
 		       u64 start, u64 len);
 
 /* ioctl.c */
-extern int ext3_ioctl (struct inode *, struct file *, unsigned int,
-		       unsigned long);
-extern long ext3_compat_ioctl (struct file *, unsigned int, unsigned long);
+extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
+extern long ext3_compat_ioctl(struct file *, unsigned int, unsigned long);
 
 /* namei.c */
 extern int ext3_orphan_add(handle_t *, struct inode *);

_