Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
OpenBMC Firmware
talos-obmc-linux
Commits
06b16e9f
Commit
06b16e9f
authored
15 years ago
by
Al Viro
Browse files
Options
Download
Email Patches
Plain Diff
switch shmem to inode->i_acl
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
281eede0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
36 deletions
+10
-36
include/linux/shmem_fs.h
include/linux/shmem_fs.h
+0
-8
mm/shmem.c
mm/shmem.c
+4
-5
mm/shmem_acl.c
mm/shmem_acl.c
+6
-23
No files found.
include/linux/shmem_fs.h
View file @
06b16e9f
...
...
@@ -19,10 +19,6 @@ struct shmem_inode_info {
swp_entry_t
i_direct
[
SHMEM_NR_DIRECT
];
/* first blocks */
struct
list_head
swaplist
;
/* chain of maybes on swap */
struct
inode
vfs_inode
;
#ifdef CONFIG_TMPFS_POSIX_ACL
struct
posix_acl
*
i_acl
;
struct
posix_acl
*
i_default_acl
;
#endif
};
struct
shmem_sb_info
{
...
...
@@ -45,7 +41,6 @@ static inline struct shmem_inode_info *SHMEM_I(struct inode *inode)
#ifdef CONFIG_TMPFS_POSIX_ACL
int
shmem_permission
(
struct
inode
*
,
int
);
int
shmem_acl_init
(
struct
inode
*
,
struct
inode
*
);
void
shmem_acl_destroy_inode
(
struct
inode
*
);
extern
struct
xattr_handler
shmem_xattr_acl_access_handler
;
extern
struct
xattr_handler
shmem_xattr_acl_default_handler
;
...
...
@@ -57,9 +52,6 @@ static inline int shmem_acl_init(struct inode *inode, struct inode *dir)
{
return
0
;
}
static
inline
void
shmem_acl_destroy_inode
(
struct
inode
*
inode
)
{
}
#endif
/* CONFIG_TMPFS_POSIX_ACL */
#endif
This diff is collapsed.
Click to expand it.
mm/shmem.c
View file @
06b16e9f
...
...
@@ -2379,6 +2379,10 @@ static struct inode *shmem_alloc_inode(struct super_block *sb)
p = (struct shmem_inode_info *)kmem_cache_alloc(shmem_inode_cachep, GFP_KERNEL);
if (!p)
return NULL;
#ifdef CONFIG_TMPFS_POSIX_ACL
p->vfs_inode.i_acl = NULL;
p->vfs_inode.i_default_acl = NULL;
#endif
return &p->vfs_inode;
}
...
...
@@ -2388,7 +2392,6 @@ static void shmem_destroy_inode(struct inode *inode)
/* only struct inode is valid if it's an inline symlink */
mpol_free_shared_policy(&SHMEM_I(inode)->policy);
}
shmem_acl_destroy_inode(inode);
kmem_cache_free(shmem_inode_cachep, SHMEM_I(inode));
}
...
...
@@ -2397,10 +2400,6 @@ static void init_once(void *foo)
struct shmem_inode_info *p = (struct shmem_inode_info *) foo;
inode_init_once(&p->vfs_inode);
#ifdef CONFIG_TMPFS_POSIX_ACL
p->i_acl = NULL;
p->i_default_acl = NULL;
#endif
}
static int init_inodecache(void)
...
...
This diff is collapsed.
Click to expand it.
mm/shmem_acl.c
View file @
06b16e9f
...
...
@@ -22,11 +22,11 @@ shmem_get_acl(struct inode *inode, int type)
spin_lock
(
&
inode
->
i_lock
);
switch
(
type
)
{
case
ACL_TYPE_ACCESS
:
acl
=
posix_acl_dup
(
SHMEM_I
(
inode
)
->
i_acl
);
acl
=
posix_acl_dup
(
inode
->
i_acl
);
break
;
case
ACL_TYPE_DEFAULT
:
acl
=
posix_acl_dup
(
SHMEM_I
(
inode
)
->
i_default_acl
);
acl
=
posix_acl_dup
(
inode
->
i_default_acl
);
break
;
}
spin_unlock
(
&
inode
->
i_lock
);
...
...
@@ -45,13 +45,13 @@ shmem_set_acl(struct inode *inode, int type, struct posix_acl *acl)
spin_lock
(
&
inode
->
i_lock
);
switch
(
type
)
{
case
ACL_TYPE_ACCESS
:
free
=
SHMEM_I
(
inode
)
->
i_acl
;
SHMEM_I
(
inode
)
->
i_acl
=
posix_acl_dup
(
acl
);
free
=
inode
->
i_acl
;
inode
->
i_acl
=
posix_acl_dup
(
acl
);
break
;
case
ACL_TYPE_DEFAULT
:
free
=
SHMEM_I
(
inode
)
->
i_default_acl
;
SHMEM_I
(
inode
)
->
i_default_acl
=
posix_acl_dup
(
acl
);
free
=
inode
->
i_default_acl
;
inode
->
i_default_acl
=
posix_acl_dup
(
acl
);
break
;
}
spin_unlock
(
&
inode
->
i_lock
);
...
...
@@ -154,23 +154,6 @@ shmem_acl_init(struct inode *inode, struct inode *dir)
return
generic_acl_init
(
inode
,
dir
,
&
shmem_acl_ops
);
}
/**
* shmem_acl_destroy_inode - destroy acls hanging off the in-memory inode
*
* This is done before destroying the actual inode.
*/
void
shmem_acl_destroy_inode
(
struct
inode
*
inode
)
{
if
(
SHMEM_I
(
inode
)
->
i_acl
)
posix_acl_release
(
SHMEM_I
(
inode
)
->
i_acl
);
SHMEM_I
(
inode
)
->
i_acl
=
NULL
;
if
(
SHMEM_I
(
inode
)
->
i_default_acl
)
posix_acl_release
(
SHMEM_I
(
inode
)
->
i_default_acl
);
SHMEM_I
(
inode
)
->
i_default_acl
=
NULL
;
}
/**
* shmem_check_acl - check_acl() callback for generic_permission()
*/
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment