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
0ccb2863
Commit
0ccb2863
authored
Mar 14, 2014
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fold __get_file_write_access() into its only caller
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
4597e695
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
19 deletions
+6
-19
fs/open.c
fs/open.c
+6
-19
No files found.
fs/open.c
View file @
0ccb2863
...
...
@@ -632,24 +632,6 @@ SYSCALL_DEFINE3(fchown, unsigned int, fd, uid_t, user, gid_t, group)
return
error
;
}
/*
* You have to be very careful that these write
* counts get cleaned up in error cases and
* upon __fput(). This should probably never
* be called outside of __dentry_open().
*/
static
inline
int
__get_file_write_access
(
struct
inode
*
inode
,
struct
vfsmount
*
mnt
)
{
int
error
=
get_write_access
(
inode
);
if
(
error
)
return
error
;
error
=
__mnt_want_write
(
mnt
);
if
(
error
)
put_write_access
(
inode
);
return
error
;
}
int
open_check_o_direct
(
struct
file
*
f
)
{
/* NB: we're sure to have correct a_ops only after f_op->open */
...
...
@@ -680,9 +662,14 @@ static int do_dentry_open(struct file *f,
path_get
(
&
f
->
f_path
);
inode
=
f
->
f_inode
=
f
->
f_path
.
dentry
->
d_inode
;
if
(
f
->
f_mode
&
FMODE_WRITE
&&
!
special_file
(
inode
->
i_mode
))
{
error
=
__get_file_write_access
(
inode
,
f
->
f_path
.
mnt
);
error
=
get_write_access
(
inode
);
if
(
error
)
goto
cleanup_file
;
error
=
__mnt_want_write
(
f
->
f_path
.
mnt
);
if
(
error
)
{
put_write_access
(
inode
);
goto
cleanup_file
;
}
}
f
->
f_mapping
=
inode
->
i_mapping
;
...
...
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