Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
20eb0cf9
Commit
20eb0cf9
authored
Oct 28, 2022
by
Christian Brauner
Committed by
Christian Brauner (Microsoft)
Oct 28, 2022
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fs.acl.rework' into for-next
parents
e4236f97
a351b1f4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
13 deletions
+4
-13
fs/posix_acl.c
fs/posix_acl.c
+4
-3
include/linux/posix_acl_xattr.h
include/linux/posix_acl_xattr.h
+0
-10
No files found.
fs/posix_acl.c
View file @
20eb0cf9
...
@@ -884,9 +884,10 @@ EXPORT_SYMBOL (posix_acl_to_xattr);
...
@@ -884,9 +884,10 @@ EXPORT_SYMBOL (posix_acl_to_xattr);
* Return: On success, the size of the stored uapi posix acls, on error a
* Return: On success, the size of the stored uapi posix acls, on error a
* negative errno.
* negative errno.
*/
*/
ssize_t
vfs_posix_acl_to_xattr
(
struct
user_namespace
*
mnt_userns
,
static
ssize_t
vfs_posix_acl_to_xattr
(
struct
user_namespace
*
mnt_userns
,
struct
inode
*
inode
,
const
struct
posix_acl
*
acl
,
struct
inode
*
inode
,
void
*
buffer
,
size_t
size
)
const
struct
posix_acl
*
acl
,
void
*
buffer
,
size_t
size
)
{
{
struct
posix_acl_xattr_header
*
ext_acl
=
buffer
;
struct
posix_acl_xattr_header
*
ext_acl
=
buffer
;
...
...
include/linux/posix_acl_xattr.h
View file @
20eb0cf9
...
@@ -35,9 +35,6 @@ posix_acl_xattr_count(size_t size)
...
@@ -35,9 +35,6 @@ posix_acl_xattr_count(size_t size)
#ifdef CONFIG_FS_POSIX_ACL
#ifdef CONFIG_FS_POSIX_ACL
struct
posix_acl
*
posix_acl_from_xattr
(
struct
user_namespace
*
user_ns
,
struct
posix_acl
*
posix_acl_from_xattr
(
struct
user_namespace
*
user_ns
,
const
void
*
value
,
size_t
size
);
const
void
*
value
,
size_t
size
);
ssize_t
vfs_posix_acl_to_xattr
(
struct
user_namespace
*
mnt_userns
,
struct
inode
*
inode
,
const
struct
posix_acl
*
acl
,
void
*
buffer
,
size_t
size
);
#else
#else
static
inline
struct
posix_acl
*
static
inline
struct
posix_acl
*
posix_acl_from_xattr
(
struct
user_namespace
*
user_ns
,
const
void
*
value
,
posix_acl_from_xattr
(
struct
user_namespace
*
user_ns
,
const
void
*
value
,
...
@@ -45,13 +42,6 @@ posix_acl_from_xattr(struct user_namespace *user_ns, const void *value,
...
@@ -45,13 +42,6 @@ posix_acl_from_xattr(struct user_namespace *user_ns, const void *value,
{
{
return
ERR_PTR
(
-
EOPNOTSUPP
);
return
ERR_PTR
(
-
EOPNOTSUPP
);
}
}
static
inline
ssize_t
vfs_posix_acl_to_xattr
(
struct
user_namespace
*
mnt_userns
,
struct
inode
*
inode
,
const
struct
posix_acl
*
acl
,
void
*
buffer
,
size_t
size
)
{
return
0
;
}
#endif
#endif
int
posix_acl_to_xattr
(
struct
user_namespace
*
user_ns
,
int
posix_acl_to_xattr
(
struct
user_namespace
*
user_ns
,
...
...
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