aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/fs.h
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-06-22 12:40:19 +0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-07-14 16:33:39 +0400
commit30d904947459cca2beb69e0110716f5248b31f2a (patch)
tree024e2a913266377d234147b14b7eb37017546173 /include/linux/fs.h
parenta4a3bdd778715999ddfeefdc52ab76254580fa76 (diff)
kill struct opendata
Just pass struct file *. Methods are happier that way... There's no need to return struct file * from finish_open() now, so let it return int. Next: saner prototypes for parts in namei.c Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r--include/linux/fs.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 33bda922988..1dcc75c9576 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -427,7 +427,6 @@ struct kstatfs;
struct vm_area_struct;
struct vfsmount;
struct cred;
-struct opendata;
extern void __init inode_init(void);
extern void __init inode_init_early(void);
@@ -1695,7 +1694,7 @@ struct inode_operations {
u64 len);
int (*update_time)(struct inode *, struct timespec *, int);
int (*atomic_open)(struct inode *, struct dentry *,
- struct opendata *, unsigned open_flag,
+ struct file *, unsigned open_flag,
umode_t create_mode, int *opened);
} ____cacheline_aligned;
@@ -2069,10 +2068,10 @@ enum {
FILE_CREATED = 1,
FILE_OPENED = 2
};
-extern struct file *finish_open(struct opendata *od, struct dentry *dentry,
- int (*open)(struct inode *, struct file *),
- int *opened);
-extern void finish_no_open(struct opendata *od, struct dentry *dentry);
+extern int finish_open(struct file *file, struct dentry *dentry,
+ int (*open)(struct inode *, struct file *),
+ int *opened);
+extern void finish_no_open(struct file *file, struct dentry *dentry);
/* fs/ioctl.c */