Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
L
Linux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
E-EXK4 - Operating System Group
projects
Linux
Commits
b20a95a0
Commit
b20a95a0
authored
11 years ago
by
Yan, Zheng
Committed by
Sage Weil
11 years ago
Browse files
Options
Downloads
Patches
Plain Diff
ceph: add missing init_acl() for mkdir() and atomic_open()
Signed-off-by:
Yan, Zheng
<
zheng.z.yan@intel.com
>
parent
7a92d647
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
fs/ceph/dir.c
+8
-5
8 additions, 5 deletions
fs/ceph/dir.c
fs/ceph/file.c
+1
-0
1 addition, 0 deletions
fs/ceph/file.c
with
9 additions
and
5 deletions
fs/ceph/dir.c
+
8
−
5
View file @
b20a95a0
...
...
@@ -695,9 +695,8 @@ static int ceph_mknod(struct inode *dir, struct dentry *dentry,
ceph_mdsc_put_request
(
req
);
if
(
!
err
)
err
=
ceph_init_acl
(
dentry
,
dentry
->
d_inode
,
dir
);
if
(
err
)
ceph_init_acl
(
dentry
,
dentry
->
d_inode
,
dir
);
else
d_drop
(
dentry
);
return
err
;
}
...
...
@@ -735,7 +734,9 @@ static int ceph_symlink(struct inode *dir, struct dentry *dentry,
if
(
!
err
&&
!
req
->
r_reply_info
.
head
->
is_dentry
)
err
=
ceph_handle_notrace_create
(
dir
,
dentry
);
ceph_mdsc_put_request
(
req
);
if
(
err
)
if
(
!
err
)
ceph_init_acl
(
dentry
,
dentry
->
d_inode
,
dir
);
else
d_drop
(
dentry
);
return
err
;
}
...
...
@@ -776,7 +777,9 @@ static int ceph_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
err
=
ceph_handle_notrace_create
(
dir
,
dentry
);
ceph_mdsc_put_request
(
req
);
out:
if
(
err
<
0
)
if
(
!
err
)
ceph_init_acl
(
dentry
,
dentry
->
d_inode
,
dir
);
else
d_drop
(
dentry
);
return
err
;
}
...
...
This diff is collapsed.
Click to expand it.
fs/ceph/file.c
+
1
−
0
View file @
b20a95a0
...
...
@@ -286,6 +286,7 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry,
}
else
{
dout
(
"atomic_open finish_open on dn %p
\n
"
,
dn
);
if
(
req
->
r_op
==
CEPH_MDS_OP_CREATE
&&
req
->
r_reply_info
.
has_create_ino
)
{
ceph_init_acl
(
dentry
,
dentry
->
d_inode
,
dir
);
*
opened
|=
FILE_CREATED
;
}
err
=
finish_open
(
file
,
dentry
,
ceph_open
,
opened
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment