diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 13:52:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 13:52:56 -0400 |
| commit | 092e0e7e520a1fca03e13c9f2d157432a8657ff2 (patch) | |
| tree | 451897252c4c08c4b5a8ef535da156f1e817e80b /block/bsg.c | |
| parent | 79f14b7c56d3b3ba58f8b43d1f70b9b71477a800 (diff) | |
| parent | 776c163b1b93c8dfa5edba885bc2bfbc2d228a5f (diff) | |
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
* 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
vfs: make no_llseek the default
vfs: don't use BKL in default_llseek
llseek: automatically add .llseek fop
libfs: use generic_file_llseek for simple_attr
mac80211: disallow seeks in minstrel debug code
lirc: make chardev nonseekable
viotape: use noop_llseek
raw: use explicit llseek file operations
ibmasmfs: use generic_file_llseek
spufs: use llseek in all file operations
arm/omap: use generic_file_llseek in iommu_debug
lkdtm: use generic_file_llseek in debugfs
net/wireless: use generic_file_llseek in debugfs
drm: use noop_llseek
Diffstat (limited to 'block/bsg.c')
| -rw-r--r-- | block/bsg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/bsg.c b/block/bsg.c index d3afe702ede7..f20d6a789d48 100644 --- a/block/bsg.c +++ b/block/bsg.c | |||
| @@ -965,6 +965,7 @@ static const struct file_operations bsg_fops = { | |||
| 965 | .release = bsg_release, | 965 | .release = bsg_release, |
| 966 | .unlocked_ioctl = bsg_ioctl, | 966 | .unlocked_ioctl = bsg_ioctl, |
| 967 | .owner = THIS_MODULE, | 967 | .owner = THIS_MODULE, |
| 968 | .llseek = default_llseek, | ||
| 968 | }; | 969 | }; |
| 969 | 970 | ||
| 970 | void bsg_unregister_queue(struct request_queue *q) | 971 | void bsg_unregister_queue(struct request_queue *q) |