Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
bug2833
cloud-kernel
提交
8aeba3c6
cloud-kernel
项目概览
bug2833
/
cloud-kernel
与 Fork 源项目一致
Fork自
openanolis / cloud-kernel
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8aeba3c6
编写于
2月 01, 2006
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
上级
61ee9cd5
e6da74e1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
17 addition
and
3 deletion
+17
-3
fs/cifs/connect.c
fs/cifs/connect.c
+10
-1
fs/cifs/file.c
fs/cifs/file.c
+7
-1
fs/cifs/transport.c
fs/cifs/transport.c
+0
-1
未找到文件。
fs/cifs/connect.c
浏览文件 @
8aeba3c6
...
@@ -1785,7 +1785,16 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
...
@@ -1785,7 +1785,16 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
}
else
if
(
volume_info
.
wsize
)
}
else
if
(
volume_info
.
wsize
)
cifs_sb
->
wsize
=
volume_info
.
wsize
;
cifs_sb
->
wsize
=
volume_info
.
wsize
;
else
else
cifs_sb
->
wsize
=
CIFSMaxBufSize
;
/* default */
cifs_sb
->
wsize
=
min_t
(
const
int
,
PAGEVEC_SIZE
*
PAGE_CACHE_SIZE
,
127
*
1024
);
/* old default of CIFSMaxBufSize was too small now
that SMB Write2 can send multiple pages in kvec.
RFC1001 does not describe what happens when frame
bigger than 128K is sent so use that as max in
conjunction with 52K kvec constraint on arch with 4K
page size */
if
(
cifs_sb
->
rsize
<
PAGE_CACHE_SIZE
)
{
if
(
cifs_sb
->
rsize
<
PAGE_CACHE_SIZE
)
{
cifs_sb
->
rsize
=
PAGE_CACHE_SIZE
;
cifs_sb
->
rsize
=
PAGE_CACHE_SIZE
;
/* Windows ME does this */
/* Windows ME does this */
...
...
fs/cifs/file.c
浏览文件 @
8aeba3c6
...
@@ -1190,7 +1190,6 @@ static int cifs_writepages(struct address_space *mapping,
...
@@ -1190,7 +1190,6 @@ static int cifs_writepages(struct address_space *mapping,
/* BB what if continued retry is
/* BB what if continued retry is
requested via mount flags? */
requested via mount flags? */
set_bit
(
AS_EIO
,
&
mapping
->
flags
);
set_bit
(
AS_EIO
,
&
mapping
->
flags
);
SetPageError
(
page
);
}
else
{
}
else
{
cifs_stats_bytes_written
(
cifs_sb
->
tcon
,
cifs_stats_bytes_written
(
cifs_sb
->
tcon
,
bytes_written
);
bytes_written
);
...
@@ -1198,6 +1197,13 @@ static int cifs_writepages(struct address_space *mapping,
...
@@ -1198,6 +1197,13 @@ static int cifs_writepages(struct address_space *mapping,
}
}
for
(
i
=
0
;
i
<
n_iov
;
i
++
)
{
for
(
i
=
0
;
i
<
n_iov
;
i
++
)
{
page
=
pvec
.
pages
[
first
+
i
];
page
=
pvec
.
pages
[
first
+
i
];
/* Should we also set page error on
success rc but too little data written? */
/* BB investigate retry logic on temporary
server crash cases and how recovery works
when page marked as error */
if
(
rc
)
SetPageError
(
page
);
kunmap
(
page
);
kunmap
(
page
);
unlock_page
(
page
);
unlock_page
(
page
);
page_cache_release
(
page
);
page_cache_release
(
page
);
...
...
fs/cifs/transport.c
浏览文件 @
8aeba3c6
...
@@ -498,7 +498,6 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses,
...
@@ -498,7 +498,6 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses,
else
else
*
pRespBufType
=
CIFS_SMALL_BUFFER
;
*
pRespBufType
=
CIFS_SMALL_BUFFER
;
iov
[
0
].
iov_len
=
receive_len
+
4
;
iov
[
0
].
iov_len
=
receive_len
+
4
;
iov
[
1
].
iov_len
=
0
;
dump_smb
(
midQ
->
resp_buf
,
80
);
dump_smb
(
midQ
->
resp_buf
,
80
);
/* convert the length into a more usable form */
/* convert the length into a more usable form */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录