Commit 3f4d5a00 authored by Al Viro's avatar Al Viro

tidy do_dentry_open() up a bit

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 83f936c7
...@@ -656,30 +656,28 @@ static int do_dentry_open(struct file *f, ...@@ -656,30 +656,28 @@ static int do_dentry_open(struct file *f,
f->f_mode = OPEN_FMODE(f->f_flags) | FMODE_LSEEK | f->f_mode = OPEN_FMODE(f->f_flags) | FMODE_LSEEK |
FMODE_PREAD | FMODE_PWRITE; FMODE_PREAD | FMODE_PWRITE;
if (unlikely(f->f_flags & O_PATH))
f->f_mode = FMODE_PATH;
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;
f->f_mapping = inode->i_mapping;
if (unlikely(f->f_flags & O_PATH)) {
f->f_mode = FMODE_PATH;
f->f_op = &empty_fops;
return 0;
}
if (f->f_mode & FMODE_WRITE && !special_file(inode->i_mode)) { if (f->f_mode & FMODE_WRITE && !special_file(inode->i_mode)) {
error = get_write_access(inode); error = get_write_access(inode);
if (error) if (unlikely(error))
goto cleanup_file; goto cleanup_file;
error = __mnt_want_write(f->f_path.mnt); error = __mnt_want_write(f->f_path.mnt);
if (error) { if (unlikely(error)) {
put_write_access(inode); put_write_access(inode);
goto cleanup_file; goto cleanup_file;
} }
f->f_mode |= FMODE_WRITER; f->f_mode |= FMODE_WRITER;
} }
f->f_mapping = inode->i_mapping;
if (unlikely(f->f_mode & FMODE_PATH)) {
f->f_op = &empty_fops;
return 0;
}
/* POSIX.1-2008/SUSv4 Section XSI 2.9.7 */ /* POSIX.1-2008/SUSv4 Section XSI 2.9.7 */
if (S_ISREG(inode->i_mode)) if (S_ISREG(inode->i_mode))
f->f_mode |= FMODE_ATOMIC_POS; f->f_mode |= FMODE_ATOMIC_POS;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment