Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 14f9f7b28e9f4c2102337d45f8d324c004a57481

Authored by Andi Kleen
Committed by Linus Torvalds
1 parent f762e9054f
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

BKL-removal: convert ext2 over to use unlocked_ioctl 

I checked ext2_ioctl and could not find anything in there that would need the
BKL.  So convert it over to use unlocked_ioctl

Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 4 changed files with 7 additions and 14 deletions Side-by-side Diff

... ... @@ -703,7 +703,7 @@
703 703 .llseek = generic_file_llseek,
704 704 .read = generic_read_dir,
705 705 .readdir = ext2_readdir,
706   - .ioctl = ext2_ioctl,
  706 + .unlocked_ioctl = ext2_ioctl,
707 707 #ifdef CONFIG_COMPAT
708 708 .compat_ioctl = ext2_compat_ioctl,
709 709 #endif
... ... @@ -139,8 +139,7 @@
139 139 struct page **pagep, void **fsdata);
140 140  
141 141 /* ioctl.c */
142   -extern int ext2_ioctl (struct inode *, struct file *, unsigned int,
143   - unsigned long);
  142 +extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
144 143 extern long ext2_compat_ioctl(struct file *, unsigned int, unsigned long);
145 144  
146 145 /* namei.c */
... ... @@ -48,7 +48,7 @@
48 48 .write = do_sync_write,
49 49 .aio_read = generic_file_aio_read,
50 50 .aio_write = generic_file_aio_write,
51   - .ioctl = ext2_ioctl,
  51 + .unlocked_ioctl = ext2_ioctl,
52 52 #ifdef CONFIG_COMPAT
53 53 .compat_ioctl = ext2_compat_ioctl,
54 54 #endif
... ... @@ -65,7 +65,7 @@
65 65 .llseek = generic_file_llseek,
66 66 .read = xip_file_read,
67 67 .write = xip_file_write,
68   - .ioctl = ext2_ioctl,
  68 + .unlocked_ioctl = ext2_ioctl,
69 69 #ifdef CONFIG_COMPAT
70 70 .compat_ioctl = ext2_compat_ioctl,
71 71 #endif
... ... @@ -17,9 +17,9 @@
17 17 #include <asm/uaccess.h>
18 18  
19 19  
20   -int ext2_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
21   - unsigned long arg)
  20 +long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
22 21 {
  22 + struct inode *inode = filp->f_dentry->d_inode;
23 23 struct ext2_inode_info *ei = EXT2_I(inode);
24 24 unsigned int flags;
25 25 unsigned short rsv_window_size;
... ... @@ -141,9 +141,6 @@
141 141 #ifdef CONFIG_COMPAT
142 142 long ext2_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
143 143 {
144   - struct inode *inode = file->f_path.dentry->d_inode;
145   - int ret;
146   -
147 144 /* These are just misnamed, they actually get/put from/to user an int */
148 145 switch (cmd) {
149 146 case EXT2_IOC32_GETFLAGS:
... ... @@ -161,10 +158,7 @@
161 158 default:
162 159 return -ENOIOCTLCMD;
163 160 }
164   - lock_kernel();
165   - ret = ext2_ioctl(inode, file, cmd, (unsigned long) compat_ptr(arg));
166   - unlock_kernel();
167   - return ret;
  161 + return ext2_ioctl(file, cmd, (unsigned long) compat_ptr(arg));
168 162 }
169 163 #endif