Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
ccca2683
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ccca2683
编写于
4月 05, 2015
作者:
A
Al Viro
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ntfs: move iov_iter_truncate() closer to generic_write_checks()
Signed-off-by:
N
Al Viro
<
viro@zeniv.linux.org.uk
>
上级
f765b134
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
29 addition
and
52 deletion
+29
-52
fs/ntfs/file.c
fs/ntfs/file.c
+29
-52
未找到文件。
fs/ntfs/file.c
浏览文件 @
ccca2683
...
...
@@ -328,26 +328,29 @@ static int ntfs_attr_extend_initialized(ntfs_inode *ni, const s64 new_init_size)
return
err
;
}
static
ssize_t
ntfs_prepare_file_for_write
(
struct
file
*
file
,
loff_t
*
ppos
,
s
ize_t
*
count
)
static
ssize_t
ntfs_prepare_file_for_write
(
struct
kiocb
*
iocb
,
s
truct
iov_iter
*
from
)
{
loff_t
pos
;
s64
end
,
ll
;
ssize_t
err
;
unsigned
long
flags
;
struct
file
*
file
=
iocb
->
ki_filp
;
struct
inode
*
vi
=
file_inode
(
file
);
ntfs_inode
*
base_ni
,
*
ni
=
NTFS_I
(
vi
);
ntfs_volume
*
vol
=
ni
->
vol
;
size_t
count
=
iov_iter_count
(
from
);
ntfs_debug
(
"Entering for i_ino 0x%lx, attribute type 0x%x, pos "
"0x%llx, count 0x%
l
x."
,
vi
->
i_ino
,
"0x%llx, count 0x%
z
x."
,
vi
->
i_ino
,
(
unsigned
)
le32_to_cpu
(
ni
->
type
),
(
unsigned
long
long
)
*
ppos
,
(
unsigned
long
)
*
count
);
/* We can write back this queue in page reclaim. */
current
->
backing_dev_info
=
inode_to_bdi
(
vi
);
err
=
generic_write_checks
(
file
,
ppos
,
count
,
S_ISBLK
(
vi
->
i_mode
));
(
unsigned
long
long
)
iocb
->
ki_pos
,
count
);
err
=
generic_write_checks
(
file
,
&
iocb
->
ki_pos
,
&
count
,
S_ISBLK
(
vi
->
i_mode
));
if
(
unlikely
(
err
))
goto
out
;
iov_iter_truncate
(
from
,
count
);
if
(
count
==
0
)
goto
out
;
/*
* All checks have passed. Before we start doing any writing we want
* to abort any totally illegal writes.
...
...
@@ -379,8 +382,6 @@ static ssize_t ntfs_prepare_file_for_write(struct file *file, loff_t *ppos,
err
=
-
EOPNOTSUPP
;
goto
out
;
}
if
(
*
count
==
0
)
goto
out
;
base_ni
=
ni
;
if
(
NInoAttr
(
ni
))
base_ni
=
ni
->
ext
.
base_ntfs_ino
;
...
...
@@ -392,9 +393,9 @@ static ssize_t ntfs_prepare_file_for_write(struct file *file, loff_t *ppos,
* cannot fail either so there is no need to check the return code.
*/
file_update_time
(
file
);
pos
=
*
p
pos
;
pos
=
iocb
->
ki_
pos
;
/* The first byte after the last cluster being written to. */
end
=
(
pos
+
*
count
+
vol
->
cluster_size_mask
)
&
end
=
(
pos
+
iov_iter_count
(
from
)
+
vol
->
cluster_size_mask
)
&
~
(
u64
)
vol
->
cluster_size_mask
;
/*
* If the write goes beyond the allocated size, extend the allocation
...
...
@@ -422,7 +423,7 @@ static ssize_t ntfs_prepare_file_for_write(struct file *file, loff_t *ppos,
"partially extended."
,
vi
->
i_ino
,
(
unsigned
)
le32_to_cpu
(
ni
->
type
));
*
count
=
ll
-
pos
;
iov_iter_truncate
(
from
,
ll
-
pos
)
;
}
}
else
{
err
=
ll
;
...
...
@@ -438,7 +439,7 @@ static ssize_t ntfs_prepare_file_for_write(struct file *file, loff_t *ppos,
vi
->
i_ino
,
(
unsigned
)
le32_to_cpu
(
ni
->
type
),
(
int
)
-
err
);
*
count
=
ll
-
pos
;
iov_iter_truncate
(
from
,
ll
-
pos
)
;
}
else
{
if
(
err
!=
-
ENOSPC
)
ntfs_error
(
vi
->
i_sb
,
"Cannot perform "
...
...
@@ -1929,61 +1930,37 @@ static ssize_t ntfs_perform_write(struct file *file, struct iov_iter *i,
return
written
?
written
:
status
;
}
/**
* ntfs_file_write_iter_nolock - write data to a file
* @iocb: IO state structure (file, offset, etc.)
* @from: iov_iter with data to write
*
* Basically the same as __generic_file_write_iter() except that it ends
* up calling ntfs_perform_write() instead of generic_perform_write() and that
* O_DIRECT is not implemented.
*/
static
ssize_t
ntfs_file_write_iter_nolock
(
struct
kiocb
*
iocb
,
struct
iov_iter
*
from
)
{
struct
file
*
file
=
iocb
->
ki_filp
;
loff_t
pos
=
iocb
->
ki_pos
;
ssize_t
written
=
0
;
ssize_t
err
;
size_t
count
=
iov_iter_count
(
from
);
err
=
ntfs_prepare_file_for_write
(
file
,
&
pos
,
&
count
);
if
(
count
&&
!
err
)
{
iov_iter_truncate
(
from
,
count
);
written
=
ntfs_perform_write
(
file
,
from
,
pos
);
if
(
likely
(
written
>=
0
))
iocb
->
ki_pos
=
pos
+
written
;
}
current
->
backing_dev_info
=
NULL
;
return
written
?
written
:
err
;
}
/**
* ntfs_file_write_iter - simple wrapper for ntfs_file_write_iter_nolock()
* @iocb: IO state structure
* @from: iov_iter with data to write
*
* Basically the same as generic_file_write_iter() except that it ends up
*
calling ntfs_file_write_iter_nolock() instead of
*
__generic_file_write_iter()
.
*
up calling ntfs_perform_write() instead of generic_perform_write() and that
*
O_DIRECT is not implemented
.
*/
static
ssize_t
ntfs_file_write_iter
(
struct
kiocb
*
iocb
,
struct
iov_iter
*
from
)
{
struct
file
*
file
=
iocb
->
ki_filp
;
struct
inode
*
vi
=
file_inode
(
file
);
ssize_t
ret
;
ssize_t
written
=
0
;
ssize_t
err
;
mutex_lock
(
&
vi
->
i_mutex
);
ret
=
ntfs_file_write_iter_nolock
(
iocb
,
from
);
/* We can write back this queue in page reclaim. */
current
->
backing_dev_info
=
inode_to_bdi
(
vi
);
err
=
ntfs_prepare_file_for_write
(
iocb
,
from
);
if
(
iov_iter_count
(
from
)
&&
!
err
)
written
=
ntfs_perform_write
(
file
,
from
,
iocb
->
ki_pos
);
current
->
backing_dev_info
=
NULL
;
mutex_unlock
(
&
vi
->
i_mutex
);
if
(
ret
>
0
)
{
ssize_t
err
;
err
=
generic_write_sync
(
file
,
iocb
->
ki_pos
-
ret
,
ret
);
if
(
likely
(
written
>
0
))
{
err
=
generic_write_sync
(
file
,
iocb
->
ki_pos
,
written
);
if
(
err
<
0
)
ret
=
err
;
written
=
0
;
}
return
ret
;
iocb
->
ki_pos
+=
written
;
return
written
?
written
:
err
;
}
/**
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录