AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-24 06:20:53 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

make finish_no_open() return int

Browse Source 
namely, 1 ;-)  That's what we want to return from ->atomic_open()
instances after finish_no_open().

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2012-06-10 06:48:09 -04:00
parent 2675a4eb6a
commit e45198a6ac
8 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/9p/vfs_inode.c
View File

@ -878,10 +878,8 @@ v9fs_vfs_atomic_open(struct inode *dir, struct dentry *dentry,
} }
/* Only creates */ /* Only creates */
if (!(flags & O_CREAT) || dentry->d_inode) { if (!(flags & O_CREAT) || dentry->d_inode)
finish_no_open(file, res); return finish_no_open(file, res);
return 1;
}
err = 0; err = 0;
fid = NULL; fid = NULL;

6
fs/9p/vfs_inode_dotl.c
View File

@ -268,10 +268,8 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
} }
/* Only creates */ /* Only creates */
if (!(flags & O_CREAT) || dentry->d_inode) { if (!(flags & O_CREAT) || dentry->d_inode)
finish_no_open(file, res); return finish_no_open(file, res);
return 1;
}
v9ses = v9fs_inode2v9ses(dir); v9ses = v9fs_inode2v9ses(dir);

6
fs/ceph/dir.c
View File

@ -662,10 +662,8 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry,
} }
/* We don't deal with positive dentries here */ /* We don't deal with positive dentries here */
if (dentry->d_inode) { if (dentry->d_inode)
finish_no_open(file, res); return finish_no_open(file, res);
return 1;
}
*opened |= FILE_CREATED; *opened |= FILE_CREATED;
err = ceph_lookup_open(dir, dentry, file, flags, mode, opened); err = ceph_lookup_open(dir, dentry, file, flags, mode, opened);

3
fs/cifs/dir.c
View File

@ -405,8 +405,7 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
if (IS_ERR(res)) if (IS_ERR(res))
return PTR_ERR(res); return PTR_ERR(res);
finish_no_open(file, res); return finish_no_open(file, res);
return 1;
} }
rc = check_name(direntry); rc = check_name(direntry);

3
fs/fuse/dir.c
View File

@ -509,8 +509,7 @@ static int fuse_atomic_open(struct inode *dir, struct dentry *entry,
if (err) if (err)
goto out_dput; goto out_dput;
no_open: no_open:
finish_no_open(file, res); return finish_no_open(file, res);
return 1;
} }
/* /*

3
fs/nfs/dir.c
View File

@ -1505,8 +1505,7 @@ static int nfs_atomic_open(struct inode *dir, struct dentry *dentry,
if (IS_ERR(res)) if (IS_ERR(res))
goto out; goto out;
finish_no_open(file, res); return finish_no_open(file, res);
return 1;
} }
static int nfs4_lookup_revalidate(struct dentry *dentry, struct nameidata *nd) static int nfs4_lookup_revalidate(struct dentry *dentry, struct nameidata *nd)

3
fs/open.c
View File

@ -810,9 +810,10 @@ EXPORT_SYMBOL(finish_open);
* This can be used to set the result of a successful lookup in ->atomic_open(). * This can be used to set the result of a successful lookup in ->atomic_open().
* The filesystem's atomic_open() method shall return NULL after calling this. * The filesystem's atomic_open() method shall return NULL after calling this.
*/ */
void finish_no_open(struct file *file, struct dentry *dentry) int finish_no_open(struct file *file, struct dentry *dentry)
{ {
file->f_path.dentry = dentry; file->f_path.dentry = dentry;
return 1;
} }
EXPORT_SYMBOL(finish_no_open); EXPORT_SYMBOL(finish_no_open);

2
include/linux/fs.h
View File

@ -2071,7 +2071,7 @@ enum {
extern int finish_open(struct file *file, struct dentry *dentry, extern int finish_open(struct file *file, struct dentry *dentry,
int (*open)(struct inode *, struct file *), int (*open)(struct inode *, struct file *),
int *opened); int *opened);
extern void finish_no_open(struct file *file, struct dentry *dentry); extern int finish_no_open(struct file *file, struct dentry *dentry);
/* fs/ioctl.c */ /* fs/ioctl.c */