diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-08 15:01:33 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-08 15:01:33 +1100 |
| commit | 3c43ddec936bcc591c7885fb9a8e596dcce24b47 (patch) | |
| tree | 0f0f494c512da962bd9df59576a543ab0aa3490e /fs/btrfs/super.c | |
| parent | bb46252c0f5b1146c63b8896a93c8fe03daa02c4 (diff) | |
| parent | 9599bc4b997ccd416665c66ab6ea090163c7432c (diff) | |
Merge remote branch 'bkl-llseek/llseek'
Conflicts:
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
drivers/infiniband/hw/cxgb4/device.c
Diffstat (limited to 'fs/btrfs/super.c')
| -rw-r--r-- | fs/btrfs/super.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 1776dbd8dc98..144f8a5730f5 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -815,6 +815,7 @@ static const struct file_operations btrfs_ctl_fops = { .unlocked_ioctl = btrfs_control_ioctl, .compat_ioctl = btrfs_control_ioctl, .owner = THIS_MODULE, + .llseek = noop_llseek, }; static struct miscdevice btrfs_misc = { |