summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2009-06-16 19:35:01 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2009-06-17 06:36:35 +0200
commitfe36adf47eb1f7f4972559efa30ce3d2d3f977f2 (patch)
tree27acbe8377f0d4a0f192daa8943c5289ac3d503d
parentremove unlock_kernel() left accidentally (diff)
downloadlinux-fe36adf47eb1f7f4972559efa30ce3d2d3f977f2.tar.xz
linux-fe36adf47eb1f7f4972559efa30ce3d2d3f977f2.zip
No instance of ->bmap() needs BKL
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--Documentation/filesystems/Locking2
-rw-r--r--fs/ioctl.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index 3120f8dd2c31..229d7b7c50a3 100644
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -187,7 +187,7 @@ readpages: no
write_begin: no locks the page yes
write_end: no yes, unlocks yes
perform_write: no n/a yes
-bmap: yes
+bmap: no
invalidatepage: no yes
releasepage: no yes
direct_IO: no
diff --git a/fs/ioctl.c b/fs/ioctl.c
index 286f38dfc6c0..001f8d3118f2 100644
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -70,9 +70,7 @@ static int ioctl_fibmap(struct file *filp, int __user *p)
res = get_user(block, p);
if (res)
return res;
- lock_kernel();
res = mapping->a_ops->bmap(mapping, block);
- unlock_kernel();
return put_user(res, p);
}