summaryrefslogtreecommitdiffstats
path: root/fs/cifs/dir.c
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 /fs/cifs/dir.c
parenta4a3bdd778715999ddfeefdc52ab76254580fa76 (diff)
downloadlinux-30d904947459cca2beb69e0110716f5248b31f2a.tar.gz
linux-30d904947459cca2beb69e0110716f5248b31f2a.tar.bz2
linux-30d904947459cca2beb69e0110716f5248b31f2a.zip
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 'fs/cifs/dir.c')
-rw-r--r--fs/cifs/dir.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 8ca70b102b95..c00c192f17e9 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -378,7 +378,7 @@ out:
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 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
if (IS_ERR(res))
return PTR_ERR(res);
- finish_no_open(od, res);
+ finish_no_open(file, res);
return 1;
}
@@ -431,9 +431,8 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
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;
}