diff options
-rw-r--r-- | Documentation/filesystems/Locking | 2 | ||||
-rw-r--r-- | fs/ioctl.c | 2 |
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 | |||
187 | write_begin: no locks the page yes | 187 | write_begin: no locks the page yes |
188 | write_end: no yes, unlocks yes | 188 | write_end: no yes, unlocks yes |
189 | perform_write: no n/a yes | 189 | perform_write: no n/a yes |
190 | bmap: yes | 190 | bmap: no |
191 | invalidatepage: no yes | 191 | invalidatepage: no yes |
192 | releasepage: no yes | 192 | releasepage: no yes |
193 | direct_IO: no | 193 | 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) | |||
70 | res = get_user(block, p); | 70 | res = get_user(block, p); |
71 | if (res) | 71 | if (res) |
72 | return res; | 72 | return res; |
73 | lock_kernel(); | ||
74 | res = mapping->a_ops->bmap(mapping, block); | 73 | res = mapping->a_ops->bmap(mapping, block); |
75 | unlock_kernel(); | ||
76 | return put_user(res, p); | 74 | return put_user(res, p); |
77 | } | 75 | } |
78 | 76 | ||