Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
ffdc9064
cloud-kernel
项目概览
openanolis
/
cloud-kernel
1 年多 前同步成功
通知
161
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看板
提交
ffdc9064
编写于
15年前
作者:
A
Al Viro
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
repair adfs ->write_inode(), switch to simple_fsync()
Signed-off-by:
N
Al Viro
<
viro@zeniv.linux.org.uk
>
上级
bea6b64c
master
alk-4.19.24
alk-4.19.30
alk-4.19.34
alk-4.19.36
alk-4.19.43
alk-4.19.48
alk-4.19.57
ck-4.19.67
ck-4.19.81
ck-4.19.91
github/fork/deepanshu1422/fix-typo-in-comment
github/fork/haosdent/fix-typo
linux-next
v4.19.91
v4.19.90
v4.19.89
v4.19.88
v4.19.87
v4.19.86
v4.19.85
v4.19.84
v4.19.83
v4.19.82
v4.19.81
v4.19.80
v4.19.79
v4.19.78
v4.19.77
v4.19.76
v4.19.75
v4.19.74
v4.19.73
v4.19.72
v4.19.71
v4.19.70
v4.19.69
v4.19.68
v4.19.67
v4.19.66
v4.19.65
v4.19.64
v4.19.63
v4.19.62
v4.19.61
v4.19.60
v4.19.59
v4.19.58
v4.19.57
v4.19.56
v4.19.55
v4.19.54
v4.19.53
v4.19.52
v4.19.51
v4.19.50
v4.19.49
v4.19.48
v4.19.47
v4.19.46
v4.19.45
v4.19.44
v4.19.43
v4.19.42
v4.19.41
v4.19.40
v4.19.39
v4.19.38
v4.19.37
v4.19.36
v4.19.35
v4.19.34
v4.19.33
v4.19.32
v4.19.31
v4.19.30
v4.19.29
v4.19.28
v4.19.27
v4.19.26
v4.19.25
v4.19.24
v4.19.23
v4.19.22
v4.19.21
v4.19.20
v4.19.19
v4.19.18
v4.19.17
v4.19.16
v4.19.15
v4.19.14
v4.19.13
v4.19.12
v4.19.11
v4.19.10
v4.19.9
v4.19.8
v4.19.7
v4.19.6
v4.19.5
v4.19.4
v4.19.3
v4.19.2
v4.19.1
v4.19
v4.19-rc8
v4.19-rc7
v4.19-rc6
v4.19-rc5
v4.19-rc4
v4.19-rc3
v4.19-rc2
v4.19-rc1
ck-release-21
ck-release-20
ck-release-19.2
ck-release-19.1
ck-release-19
ck-release-18
ck-release-17.2
ck-release-17.1
ck-release-17
ck-release-16
ck-release-15.1
ck-release-15
ck-release-14
ck-release-13.2
ck-release-13
ck-release-12
ck-release-11
ck-release-10
ck-release-9
ck-release-7
alk-release-15
alk-release-14
alk-release-13.2
alk-release-13
alk-release-12
alk-release-11
alk-release-10
alk-release-9
alk-release-7
无相关合并请求
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
48 addition
and
6 deletion
+48
-6
fs/adfs/adfs.h
fs/adfs/adfs.h
+3
-1
fs/adfs/dir.c
fs/adfs/dir.c
+8
-2
fs/adfs/dir_f.c
fs/adfs/dir_f.c
+17
-0
fs/adfs/dir_fplus.c
fs/adfs/dir_fplus.c
+17
-0
fs/adfs/file.c
fs/adfs/file.c
+1
-1
fs/adfs/inode.c
fs/adfs/inode.c
+2
-2
未找到文件。
fs/adfs/adfs.h
浏览文件 @
ffdc9064
...
...
@@ -53,6 +53,7 @@ struct adfs_dir_ops {
int
(
*
update
)(
struct
adfs_dir
*
dir
,
struct
object_info
*
obj
);
int
(
*
create
)(
struct
adfs_dir
*
dir
,
struct
object_info
*
obj
);
int
(
*
remove
)(
struct
adfs_dir
*
dir
,
struct
object_info
*
obj
);
int
(
*
sync
)(
struct
adfs_dir
*
dir
);
void
(
*
free
)(
struct
adfs_dir
*
dir
);
};
...
...
@@ -90,7 +91,8 @@ extern const struct dentry_operations adfs_dentry_operations;
extern
struct
adfs_dir_ops
adfs_f_dir_ops
;
extern
struct
adfs_dir_ops
adfs_fplus_dir_ops
;
extern
int
adfs_dir_update
(
struct
super_block
*
sb
,
struct
object_info
*
obj
);
extern
int
adfs_dir_update
(
struct
super_block
*
sb
,
struct
object_info
*
obj
,
int
wait
);
/* file.c */
extern
const
struct
inode_operations
adfs_file_inode_operations
;
...
...
This diff is collapsed.
Click to expand it.
fs/adfs/dir.c
浏览文件 @
ffdc9064
...
...
@@ -83,7 +83,7 @@ adfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
}
int
adfs_dir_update
(
struct
super_block
*
sb
,
struct
object_info
*
obj
)
adfs_dir_update
(
struct
super_block
*
sb
,
struct
object_info
*
obj
,
int
wait
)
{
int
ret
=
-
EINVAL
;
#ifdef CONFIG_ADFS_FS_RW
...
...
@@ -106,6 +106,12 @@ adfs_dir_update(struct super_block *sb, struct object_info *obj)
ret
=
ops
->
update
(
&
dir
,
obj
);
write_unlock
(
&
adfs_dir_lock
);
if
(
wait
)
{
int
err
=
ops
->
sync
(
&
dir
);
if
(
!
ret
)
ret
=
err
;
}
ops
->
free
(
&
dir
);
out:
#endif
...
...
@@ -199,7 +205,7 @@ const struct file_operations adfs_dir_operations = {
.
read
=
generic_read_dir
,
.
llseek
=
generic_file_llseek
,
.
readdir
=
adfs_readdir
,
.
fsync
=
fi
le_fsync
,
.
fsync
=
simp
le_fsync
,
};
static
int
...
...
This diff is collapsed.
Click to expand it.
fs/adfs/dir_f.c
浏览文件 @
ffdc9064
...
...
@@ -437,6 +437,22 @@ adfs_f_update(struct adfs_dir *dir, struct object_info *obj)
#endif
}
static
int
adfs_f_sync
(
struct
adfs_dir
*
dir
)
{
int
err
=
0
;
int
i
;
for
(
i
=
dir
->
nr_buffers
-
1
;
i
>=
0
;
i
--
)
{
struct
buffer_head
*
bh
=
dir
->
bh
[
i
];
sync_dirty_buffer
(
bh
);
if
(
buffer_req
(
bh
)
&&
!
buffer_uptodate
(
bh
))
err
=
-
EIO
;
}
return
err
;
}
static
void
adfs_f_free
(
struct
adfs_dir
*
dir
)
{
...
...
@@ -456,5 +472,6 @@ struct adfs_dir_ops adfs_f_dir_ops = {
.
setpos
=
adfs_f_setpos
,
.
getnext
=
adfs_f_getnext
,
.
update
=
adfs_f_update
,
.
sync
=
adfs_f_sync
,
.
free
=
adfs_f_free
};
This diff is collapsed.
Click to expand it.
fs/adfs/dir_fplus.c
浏览文件 @
ffdc9064
...
...
@@ -161,6 +161,22 @@ adfs_fplus_getnext(struct adfs_dir *dir, struct object_info *obj)
return
ret
;
}
static
int
adfs_fplus_sync
(
struct
adfs_dir
*
dir
)
{
int
err
=
0
;
int
i
;
for
(
i
=
dir
->
nr_buffers
-
1
;
i
>=
0
;
i
--
)
{
struct
buffer_head
*
bh
=
dir
->
bh
[
i
];
sync_dirty_buffer
(
bh
);
if
(
buffer_req
(
bh
)
&&
!
buffer_uptodate
(
bh
))
err
=
-
EIO
;
}
return
err
;
}
static
void
adfs_fplus_free
(
struct
adfs_dir
*
dir
)
{
...
...
@@ -175,5 +191,6 @@ struct adfs_dir_ops adfs_fplus_dir_ops = {
.
read
=
adfs_fplus_read
,
.
setpos
=
adfs_fplus_setpos
,
.
getnext
=
adfs_fplus_getnext
,
.
sync
=
adfs_fplus_sync
,
.
free
=
adfs_fplus_free
};
This diff is collapsed.
Click to expand it.
fs/adfs/file.c
浏览文件 @
ffdc9064
...
...
@@ -30,7 +30,7 @@ const struct file_operations adfs_file_operations = {
.
read
=
do_sync_read
,
.
aio_read
=
generic_file_aio_read
,
.
mmap
=
generic_file_mmap
,
.
fsync
=
fi
le_fsync
,
.
fsync
=
simp
le_fsync
,
.
write
=
do_sync_write
,
.
aio_write
=
generic_file_aio_write
,
.
splice_read
=
generic_file_splice_read
,
...
...
This diff is collapsed.
Click to expand it.
fs/adfs/inode.c
浏览文件 @
ffdc9064
...
...
@@ -376,7 +376,7 @@ adfs_notify_change(struct dentry *dentry, struct iattr *attr)
* The adfs-specific inode data has already been updated by
* adfs_notify_change()
*/
int
adfs_write_inode
(
struct
inode
*
inode
,
int
unused
)
int
adfs_write_inode
(
struct
inode
*
inode
,
int
wait
)
{
struct
super_block
*
sb
=
inode
->
i_sb
;
struct
object_info
obj
;
...
...
@@ -391,7 +391,7 @@ int adfs_write_inode(struct inode *inode, int unused)
obj
.
attr
=
ADFS_I
(
inode
)
->
attr
;
obj
.
size
=
inode
->
i_size
;
ret
=
adfs_dir_update
(
sb
,
&
obj
);
ret
=
adfs_dir_update
(
sb
,
&
obj
,
wait
);
unlock_kernel
();
return
ret
;
}
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
反馈
建议
客服
返回
顶部