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
nexedi
linux
Commits
182be684
Commit
182be684
authored
Jan 24, 2013
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kill f_vfsmnt
very few users left... Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
ecf3d1f1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
6 deletions
+5
-6
fs/ocfs2/dir.c
fs/ocfs2/dir.c
+1
-1
fs/ocfs2/file.c
fs/ocfs2/file.c
+2
-2
fs/ocfs2/mmap.c
fs/ocfs2/mmap.c
+1
-1
include/linux/fs.h
include/linux/fs.h
+0
-1
security/commoncap.c
security/commoncap.c
+1
-1
No files found.
fs/ocfs2/dir.c
View file @
182be684
...
@@ -2020,7 +2020,7 @@ int ocfs2_readdir(struct file * filp, void * dirent, filldir_t filldir)
...
@@ -2020,7 +2020,7 @@ int ocfs2_readdir(struct file * filp, void * dirent, filldir_t filldir)
trace_ocfs2_readdir
((
unsigned
long
long
)
OCFS2_I
(
inode
)
->
ip_blkno
);
trace_ocfs2_readdir
((
unsigned
long
long
)
OCFS2_I
(
inode
)
->
ip_blkno
);
error
=
ocfs2_inode_lock_atime
(
inode
,
filp
->
f_
vfs
mnt
,
&
lock_level
);
error
=
ocfs2_inode_lock_atime
(
inode
,
filp
->
f_
path
.
mnt
,
&
lock_level
);
if
(
lock_level
&&
error
>=
0
)
{
if
(
lock_level
&&
error
>=
0
)
{
/* We release EX lock which used to update atime
/* We release EX lock which used to update atime
* and get PR lock again to reduce contention
* and get PR lock again to reduce contention
...
...
fs/ocfs2/file.c
View file @
182be684
...
@@ -2526,7 +2526,7 @@ static ssize_t ocfs2_file_splice_read(struct file *in,
...
@@ -2526,7 +2526,7 @@ static ssize_t ocfs2_file_splice_read(struct file *in,
/*
/*
* See the comment in ocfs2_file_aio_read()
* See the comment in ocfs2_file_aio_read()
*/
*/
ret
=
ocfs2_inode_lock_atime
(
inode
,
in
->
f_
vfs
mnt
,
&
lock_level
);
ret
=
ocfs2_inode_lock_atime
(
inode
,
in
->
f_
path
.
mnt
,
&
lock_level
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
mlog_errno
(
ret
);
mlog_errno
(
ret
);
goto
bail
;
goto
bail
;
...
@@ -2589,7 +2589,7 @@ static ssize_t ocfs2_file_aio_read(struct kiocb *iocb,
...
@@ -2589,7 +2589,7 @@ static ssize_t ocfs2_file_aio_read(struct kiocb *iocb,
* like i_size. This allows the checks down below
* like i_size. This allows the checks down below
* generic_file_aio_read() a chance of actually working.
* generic_file_aio_read() a chance of actually working.
*/
*/
ret
=
ocfs2_inode_lock_atime
(
inode
,
filp
->
f_
vfs
mnt
,
&
lock_level
);
ret
=
ocfs2_inode_lock_atime
(
inode
,
filp
->
f_
path
.
mnt
,
&
lock_level
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
mlog_errno
(
ret
);
mlog_errno
(
ret
);
goto
bail
;
goto
bail
;
...
...
fs/ocfs2/mmap.c
View file @
182be684
...
@@ -181,7 +181,7 @@ int ocfs2_mmap(struct file *file, struct vm_area_struct *vma)
...
@@ -181,7 +181,7 @@ int ocfs2_mmap(struct file *file, struct vm_area_struct *vma)
int
ret
=
0
,
lock_level
=
0
;
int
ret
=
0
,
lock_level
=
0
;
ret
=
ocfs2_inode_lock_atime
(
file_inode
(
file
),
ret
=
ocfs2_inode_lock_atime
(
file_inode
(
file
),
file
->
f_
vfs
mnt
,
&
lock_level
);
file
->
f_
path
.
mnt
,
&
lock_level
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
mlog_errno
(
ret
);
mlog_errno
(
ret
);
goto
out
;
goto
out
;
...
...
include/linux/fs.h
View file @
182be684
...
@@ -769,7 +769,6 @@ struct file {
...
@@ -769,7 +769,6 @@ struct file {
}
f_u
;
}
f_u
;
struct
path
f_path
;
struct
path
f_path
;
#define f_dentry f_path.dentry
#define f_dentry f_path.dentry
#define f_vfsmnt f_path.mnt
const
struct
file_operations
*
f_op
;
const
struct
file_operations
*
f_op
;
/*
/*
...
...
security/commoncap.c
View file @
182be684
...
@@ -440,7 +440,7 @@ static int get_file_caps(struct linux_binprm *bprm, bool *effective, bool *has_c
...
@@ -440,7 +440,7 @@ static int get_file_caps(struct linux_binprm *bprm, bool *effective, bool *has_c
if
(
!
file_caps_enabled
)
if
(
!
file_caps_enabled
)
return
0
;
return
0
;
if
(
bprm
->
file
->
f_
vfs
mnt
->
mnt_flags
&
MNT_NOSUID
)
if
(
bprm
->
file
->
f_
path
.
mnt
->
mnt_flags
&
MNT_NOSUID
)
return
0
;
return
0
;
dentry
=
dget
(
bprm
->
file
->
f_dentry
);
dentry
=
dget
(
bprm
->
file
->
f_dentry
);
...
...
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