diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-18 15:49:48 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-18 15:49:48 +1100 |
| commit | a1991023c4efe6fecda00d961103818925883842 (patch) | |
| tree | 127a83f296cd5b1e8e61280cf92583cd3e6013a9 /block/compat_ioctl.c | |
| parent | c12379585493ecd464b39c9e605968aaeca5533d (diff) | |
| parent | 7157250cd54576dc0cbab17c27f59ff4a953fec9 (diff) | |
Merge commit 'block/for-next'
Conflicts:
fs/bio.c
Diffstat (limited to 'block/compat_ioctl.c')
| -rw-r--r-- | block/compat_ioctl.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c index 67eb93cff699..f87615dea46b 100644 --- a/block/compat_ioctl.c +++ b/block/compat_ioctl.c @@ -774,9 +774,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) bdi = blk_get_backing_dev_info(bdev); if (bdi == NULL) return -ENOTTY; - lock_kernel(); bdi->ra_pages = (arg * 512) / PAGE_CACHE_SIZE; - unlock_kernel(); return 0; case BLKGETSIZE: size = bdev->bd_inode->i_size; |