Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
mellanox
Bluefield Linux
提交
5e78b435
B
Bluefield Linux
项目概览
mellanox
/
Bluefield Linux
12 个月 前同步成功
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
B
Bluefield Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5e78b435
编写于
6月 08, 2009
作者:
A
Al Viro
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
switch ext2 to inode->i_acl
Signed-off-by:
N
Al Viro
<
viro@zeniv.linux.org.uk
>
上级
f19d4a8f
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
11 addition
and
41 deletion
+11
-41
fs/ext2/acl.c
fs/ext2/acl.c
+11
-13
fs/ext2/acl.h
fs/ext2/acl.h
+0
-4
fs/ext2/ext2.h
fs/ext2/ext2.h
+0
-4
fs/ext2/inode.c
fs/ext2/inode.c
+0
-4
fs/ext2/super.c
fs/ext2/super.c
+0
-16
未找到文件。
fs/ext2/acl.c
浏览文件 @
5e78b435
...
...
@@ -128,10 +128,10 @@ ext2_acl_to_disk(const struct posix_acl *acl, size_t *size)
static
inline
struct
posix_acl
*
ext2_iget_acl
(
struct
inode
*
inode
,
struct
posix_acl
**
i_acl
)
{
struct
posix_acl
*
acl
=
EXT2_
ACL_NOT_CACHED
;
struct
posix_acl
*
acl
=
ACL_NOT_CACHED
;
spin_lock
(
&
inode
->
i_lock
);
if
(
*
i_acl
!=
EXT2_
ACL_NOT_CACHED
)
if
(
*
i_acl
!=
ACL_NOT_CACHED
)
acl
=
posix_acl_dup
(
*
i_acl
);
spin_unlock
(
&
inode
->
i_lock
);
...
...
@@ -143,7 +143,7 @@ ext2_iset_acl(struct inode *inode, struct posix_acl **i_acl,
struct
posix_acl
*
acl
)
{
spin_lock
(
&
inode
->
i_lock
);
if
(
*
i_acl
!=
EXT2_
ACL_NOT_CACHED
)
if
(
*
i_acl
!=
ACL_NOT_CACHED
)
posix_acl_release
(
*
i_acl
);
*
i_acl
=
posix_acl_dup
(
acl
);
spin_unlock
(
&
inode
->
i_lock
);
...
...
@@ -155,7 +155,6 @@ ext2_iset_acl(struct inode *inode, struct posix_acl **i_acl,
static
struct
posix_acl
*
ext2_get_acl
(
struct
inode
*
inode
,
int
type
)
{
struct
ext2_inode_info
*
ei
=
EXT2_I
(
inode
);
int
name_index
;
char
*
value
=
NULL
;
struct
posix_acl
*
acl
;
...
...
@@ -166,15 +165,15 @@ ext2_get_acl(struct inode *inode, int type)
switch
(
type
)
{
case
ACL_TYPE_ACCESS
:
acl
=
ext2_iget_acl
(
inode
,
&
ei
->
i_acl
);
if
(
acl
!=
EXT2_
ACL_NOT_CACHED
)
acl
=
ext2_iget_acl
(
inode
,
&
inode
->
i_acl
);
if
(
acl
!=
ACL_NOT_CACHED
)
return
acl
;
name_index
=
EXT2_XATTR_INDEX_POSIX_ACL_ACCESS
;
break
;
case
ACL_TYPE_DEFAULT
:
acl
=
ext2_iget_acl
(
inode
,
&
ei
->
i_default_acl
);
if
(
acl
!=
EXT2_
ACL_NOT_CACHED
)
acl
=
ext2_iget_acl
(
inode
,
&
inode
->
i_default_acl
);
if
(
acl
!=
ACL_NOT_CACHED
)
return
acl
;
name_index
=
EXT2_XATTR_INDEX_POSIX_ACL_DEFAULT
;
break
;
...
...
@@ -200,11 +199,11 @@ ext2_get_acl(struct inode *inode, int type)
if
(
!
IS_ERR
(
acl
))
{
switch
(
type
)
{
case
ACL_TYPE_ACCESS
:
ext2_iset_acl
(
inode
,
&
ei
->
i_acl
,
acl
);
ext2_iset_acl
(
inode
,
&
inode
->
i_acl
,
acl
);
break
;
case
ACL_TYPE_DEFAULT
:
ext2_iset_acl
(
inode
,
&
ei
->
i_default_acl
,
acl
);
ext2_iset_acl
(
inode
,
&
inode
->
i_default_acl
,
acl
);
break
;
}
}
...
...
@@ -217,7 +216,6 @@ ext2_get_acl(struct inode *inode, int type)
static
int
ext2_set_acl
(
struct
inode
*
inode
,
int
type
,
struct
posix_acl
*
acl
)
{
struct
ext2_inode_info
*
ei
=
EXT2_I
(
inode
);
int
name_index
;
void
*
value
=
NULL
;
size_t
size
=
0
;
...
...
@@ -266,11 +264,11 @@ ext2_set_acl(struct inode *inode, int type, struct posix_acl *acl)
if
(
!
error
)
{
switch
(
type
)
{
case
ACL_TYPE_ACCESS
:
ext2_iset_acl
(
inode
,
&
ei
->
i_acl
,
acl
);
ext2_iset_acl
(
inode
,
&
inode
->
i_acl
,
acl
);
break
;
case
ACL_TYPE_DEFAULT
:
ext2_iset_acl
(
inode
,
&
ei
->
i_default_acl
,
acl
);
ext2_iset_acl
(
inode
,
&
inode
->
i_default_acl
,
acl
);
break
;
}
}
...
...
fs/ext2/acl.h
浏览文件 @
5e78b435
...
...
@@ -53,10 +53,6 @@ static inline int ext2_acl_count(size_t size)
#ifdef CONFIG_EXT2_FS_POSIX_ACL
/* Value for inode->u.ext2_i.i_acl and inode->u.ext2_i.i_default_acl
if the ACL has not been cached */
#define EXT2_ACL_NOT_CACHED ((void *)-1)
/* acl.c */
extern
int
ext2_permission
(
struct
inode
*
,
int
);
extern
int
ext2_acl_chmod
(
struct
inode
*
);
...
...
fs/ext2/ext2.h
浏览文件 @
5e78b435
...
...
@@ -46,10 +46,6 @@ struct ext2_inode_info {
* EAs.
*/
struct
rw_semaphore
xattr_sem
;
#endif
#ifdef CONFIG_EXT2_FS_POSIX_ACL
struct
posix_acl
*
i_acl
;
struct
posix_acl
*
i_default_acl
;
#endif
rwlock_t
i_meta_lock
;
...
...
fs/ext2/inode.c
浏览文件 @
5e78b435
...
...
@@ -1224,10 +1224,6 @@ struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
return
inode
;
ei
=
EXT2_I
(
inode
);
#ifdef CONFIG_EXT2_FS_POSIX_ACL
ei
->
i_acl
=
EXT2_ACL_NOT_CACHED
;
ei
->
i_default_acl
=
EXT2_ACL_NOT_CACHED
;
#endif
ei
->
i_block_alloc_info
=
NULL
;
raw_inode
=
ext2_get_inode
(
inode
->
i_sb
,
ino
,
&
bh
);
...
...
fs/ext2/super.c
浏览文件 @
5e78b435
...
...
@@ -152,10 +152,6 @@ static struct inode *ext2_alloc_inode(struct super_block *sb)
ei
=
(
struct
ext2_inode_info
*
)
kmem_cache_alloc
(
ext2_inode_cachep
,
GFP_KERNEL
);
if
(
!
ei
)
return
NULL
;
#ifdef CONFIG_EXT2_FS_POSIX_ACL
ei
->
i_acl
=
EXT2_ACL_NOT_CACHED
;
ei
->
i_default_acl
=
EXT2_ACL_NOT_CACHED
;
#endif
ei
->
i_block_alloc_info
=
NULL
;
ei
->
vfs_inode
.
i_version
=
1
;
return
&
ei
->
vfs_inode
;
...
...
@@ -198,18 +194,6 @@ static void destroy_inodecache(void)
static
void
ext2_clear_inode
(
struct
inode
*
inode
)
{
struct
ext2_block_alloc_info
*
rsv
=
EXT2_I
(
inode
)
->
i_block_alloc_info
;
#ifdef CONFIG_EXT2_FS_POSIX_ACL
struct
ext2_inode_info
*
ei
=
EXT2_I
(
inode
);
if
(
ei
->
i_acl
&&
ei
->
i_acl
!=
EXT2_ACL_NOT_CACHED
)
{
posix_acl_release
(
ei
->
i_acl
);
ei
->
i_acl
=
EXT2_ACL_NOT_CACHED
;
}
if
(
ei
->
i_default_acl
&&
ei
->
i_default_acl
!=
EXT2_ACL_NOT_CACHED
)
{
posix_acl_release
(
ei
->
i_default_acl
);
ei
->
i_default_acl
=
EXT2_ACL_NOT_CACHED
;
}
#endif
ext2_discard_reservation
(
inode
);
EXT2_I
(
inode
)
->
i_block_alloc_info
=
NULL
;
if
(
unlikely
(
rsv
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录