iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fold __get_file_write_access() into its only caller

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2014-03-14 10:40:46 -04:00
parent 4597e695b8
commit 0ccb286346
1 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
fs/open.c
View File

@ -632,24 +632,6 @@ out:
return error; 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) int open_check_o_direct(struct file *f)
{ {
/* NB: we're sure to have correct a_ops only after f_op->open */ /* 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); path_get(&f->f_path);
inode = f->f_inode = f->f_path.dentry->d_inode; inode = f->f_inode = f->f_path.dentry->d_inode;
if (f->f_mode & FMODE_WRITE && !special_file(inode->i_mode)) { 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) if (error)
goto cleanup_file; 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; f->f_mapping = inode->i_mapping;