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>
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 8ca70b1..c00c192 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -378,7 +378,7 @@
int
cifs_atomic_open(struct inode *inode, struct dentry *direntry,
- struct opendata *od, unsigned oflags, umode_t mode,
+ struct file *file, unsigned oflags, umode_t mode,
int *opened)
{
int rc;
@@ -405,7 +405,7 @@
if (IS_ERR(res))
return PTR_ERR(res);
- finish_no_open(od, res);
+ finish_no_open(file, res);
return 1;
}
@@ -431,9 +431,8 @@
if (rc)
goto out;
- filp = finish_open(od, direntry, generic_file_open, opened);
- if (IS_ERR(filp)) {
- rc = PTR_ERR(filp);
+ rc = finish_open(file, direntry, generic_file_open, opened);
+ if (rc) {
CIFSSMBClose(xid, tcon, fileHandle);
goto out;
}