git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha...
[pandora-kernel.git]
/
drivers
/
infiniband
/
core
/
uverbs_main.c
diff --git
a/drivers/infiniband/core/uverbs_main.c
b/drivers/infiniband/core/uverbs_main.c
index
fb35262
..
ec83e9f
100644
(file)
--- a/
drivers/infiniband/core/uverbs_main.c
+++ b/
drivers/infiniband/core/uverbs_main.c
@@
-369,7
+369,8
@@
static const struct file_operations uverbs_event_fops = {
.read = ib_uverbs_event_read,
.poll = ib_uverbs_event_poll,
.release = ib_uverbs_event_close,
.read = ib_uverbs_event_read,
.poll = ib_uverbs_event_poll,
.release = ib_uverbs_event_close,
- .fasync = ib_uverbs_event_fasync
+ .fasync = ib_uverbs_event_fasync,
+ .llseek = no_llseek,
};
void ib_uverbs_comp_handler(struct ib_cq *cq, void *cq_context)
};
void ib_uverbs_comp_handler(struct ib_cq *cq, void *cq_context)
@@
-623,7
+624,7
@@
static int ib_uverbs_open(struct inode *inode, struct file *filp)
filp->private_data = file;
filp->private_data = file;
- return
0
;
+ return
nonseekable_open(inode, filp)
;
err_module:
module_put(dev->ib_dev->owner);
err_module:
module_put(dev->ib_dev->owner);
@@
-651,7
+652,8
@@
static const struct file_operations uverbs_fops = {
.owner = THIS_MODULE,
.write = ib_uverbs_write,
.open = ib_uverbs_open,
.owner = THIS_MODULE,
.write = ib_uverbs_write,
.open = ib_uverbs_open,
- .release = ib_uverbs_close
+ .release = ib_uverbs_close,
+ .llseek = no_llseek,
};
static const struct file_operations uverbs_mmap_fops = {
};
static const struct file_operations uverbs_mmap_fops = {
@@
-659,7
+661,8
@@
static const struct file_operations uverbs_mmap_fops = {
.write = ib_uverbs_write,
.mmap = ib_uverbs_mmap,
.open = ib_uverbs_open,
.write = ib_uverbs_write,
.mmap = ib_uverbs_mmap,
.open = ib_uverbs_open,
- .release = ib_uverbs_close
+ .release = ib_uverbs_close,
+ .llseek = no_llseek,
};
static struct ib_client uverbs_client = {
};
static struct ib_client uverbs_client = {