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
7ab8b176
Commit
7ab8b176
authored
7 years ago
by
Miklos Szeredi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ovl: base tmpfile in workdir too
Signed-off-by:
Miklos Szeredi
<
mszeredi@redhat.com
>
parent
02209d10
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
fs/overlayfs/copy_up.c
fs/overlayfs/copy_up.c
+3
-5
No files found.
fs/overlayfs/copy_up.c
View file @
7ab8b176
...
@@ -345,8 +345,7 @@ static int ovl_install_temp(struct dentry *workdir, struct dentry *upperdir,
...
@@ -345,8 +345,7 @@ static int ovl_install_temp(struct dentry *workdir, struct dentry *upperdir,
return
err
;
return
err
;
}
}
static
int
ovl_get_tmpfile
(
struct
dentry
*
workdir
,
struct
dentry
*
upperdir
,
static
int
ovl_get_tmpfile
(
struct
dentry
*
workdir
,
struct
dentry
*
dentry
,
struct
dentry
*
dentry
,
struct
kstat
*
stat
,
const
char
*
link
,
bool
tmpfile
,
struct
kstat
*
stat
,
const
char
*
link
,
bool
tmpfile
,
struct
dentry
**
tempp
)
struct
dentry
**
tempp
)
{
{
...
@@ -369,7 +368,7 @@ static int ovl_get_tmpfile(struct dentry *workdir, struct dentry *upperdir,
...
@@ -369,7 +368,7 @@ static int ovl_get_tmpfile(struct dentry *workdir, struct dentry *upperdir,
old_creds
=
override_creds
(
new_creds
);
old_creds
=
override_creds
(
new_creds
);
if
(
tmpfile
)
{
if
(
tmpfile
)
{
temp
=
ovl_do_tmpfile
(
upper
dir
,
stat
->
mode
);
temp
=
ovl_do_tmpfile
(
work
dir
,
stat
->
mode
);
if
(
IS_ERR
(
temp
))
if
(
IS_ERR
(
temp
))
goto
temp_err
;
goto
temp_err
;
}
else
{
}
else
{
...
@@ -453,8 +452,7 @@ static int ovl_copy_up_locked(struct dentry *workdir, struct dentry *upperdir,
...
@@ -453,8 +452,7 @@ static int ovl_copy_up_locked(struct dentry *workdir, struct dentry *upperdir,
struct
dentry
*
temp
=
NULL
;
struct
dentry
*
temp
=
NULL
;
int
err
;
int
err
;
err
=
ovl_get_tmpfile
(
workdir
,
upperdir
,
dentry
,
stat
,
link
,
tmpfile
,
err
=
ovl_get_tmpfile
(
workdir
,
dentry
,
stat
,
link
,
tmpfile
,
&
temp
);
&
temp
);
if
(
err
)
if
(
err
)
goto
out
;
goto
out
;
...
...
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