Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
512b2268
cloud-kernel
项目概览
openanolis
/
cloud-kernel
1 年多 前同步成功
通知
160
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
512b2268
编写于
8月 23, 2014
作者:
A
Al Viro
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
switch hci_vhci to ->write_iter()
Signed-off-by:
N
Al Viro
<
viro@zeniv.linux.org.uk
>
上级
13ba33e8
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
8 addition
and
14 deletion
+8
-14
drivers/bluetooth/hci_vhci.c
drivers/bluetooth/hci_vhci.c
+8
-14
未找到文件。
drivers/bluetooth/hci_vhci.c
浏览文件 @
512b2268
...
@@ -160,13 +160,11 @@ static int vhci_create_device(struct vhci_data *data, __u8 opcode)
...
@@ -160,13 +160,11 @@ static int vhci_create_device(struct vhci_data *data, __u8 opcode)
}
}
static
inline
ssize_t
vhci_get_user
(
struct
vhci_data
*
data
,
static
inline
ssize_t
vhci_get_user
(
struct
vhci_data
*
data
,
const
struct
iovec
*
iov
,
struct
iov_iter
*
from
)
unsigned
long
count
)
{
{
size_t
len
=
iov_
length
(
iov
,
count
);
size_t
len
=
iov_
iter_count
(
from
);
struct
sk_buff
*
skb
;
struct
sk_buff
*
skb
;
__u8
pkt_type
,
opcode
;
__u8
pkt_type
,
opcode
;
unsigned
long
i
;
int
ret
;
int
ret
;
if
(
len
<
2
||
len
>
HCI_MAX_FRAME_SIZE
)
if
(
len
<
2
||
len
>
HCI_MAX_FRAME_SIZE
)
...
@@ -176,12 +174,9 @@ static inline ssize_t vhci_get_user(struct vhci_data *data,
...
@@ -176,12 +174,9 @@ static inline ssize_t vhci_get_user(struct vhci_data *data,
if
(
!
skb
)
if
(
!
skb
)
return
-
ENOMEM
;
return
-
ENOMEM
;
for
(
i
=
0
;
i
<
count
;
i
++
)
{
if
(
copy_from_iter
(
skb_put
(
skb
,
len
),
len
,
from
)
!=
len
)
{
if
(
copy_from_user
(
skb_put
(
skb
,
iov
[
i
].
iov_len
),
kfree_skb
(
skb
);
iov
[
i
].
iov_base
,
iov
[
i
].
iov_len
))
{
return
-
EFAULT
;
kfree_skb
(
skb
);
return
-
EFAULT
;
}
}
}
pkt_type
=
*
((
__u8
*
)
skb
->
data
);
pkt_type
=
*
((
__u8
*
)
skb
->
data
);
...
@@ -294,13 +289,12 @@ static ssize_t vhci_read(struct file *file,
...
@@ -294,13 +289,12 @@ static ssize_t vhci_read(struct file *file,
return
ret
;
return
ret
;
}
}
static
ssize_t
vhci_write
(
struct
kiocb
*
iocb
,
const
struct
iovec
*
iov
,
static
ssize_t
vhci_write
(
struct
kiocb
*
iocb
,
struct
iov_iter
*
from
)
unsigned
long
count
,
loff_t
pos
)
{
{
struct
file
*
file
=
iocb
->
ki_filp
;
struct
file
*
file
=
iocb
->
ki_filp
;
struct
vhci_data
*
data
=
file
->
private_data
;
struct
vhci_data
*
data
=
file
->
private_data
;
return
vhci_get_user
(
data
,
iov
,
count
);
return
vhci_get_user
(
data
,
from
);
}
}
static
unsigned
int
vhci_poll
(
struct
file
*
file
,
poll_table
*
wait
)
static
unsigned
int
vhci_poll
(
struct
file
*
file
,
poll_table
*
wait
)
...
@@ -365,7 +359,7 @@ static int vhci_release(struct inode *inode, struct file *file)
...
@@ -365,7 +359,7 @@ static int vhci_release(struct inode *inode, struct file *file)
static
const
struct
file_operations
vhci_fops
=
{
static
const
struct
file_operations
vhci_fops
=
{
.
owner
=
THIS_MODULE
,
.
owner
=
THIS_MODULE
,
.
read
=
vhci_read
,
.
read
=
vhci_read
,
.
aio_write
=
vhci_write
,
.
write_iter
=
vhci_write
,
.
poll
=
vhci_poll
,
.
poll
=
vhci_poll
,
.
open
=
vhci_open
,
.
open
=
vhci_open
,
.
release
=
vhci_release
,
.
release
=
vhci_release
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录