diff options
author | Pavel Shilovsky <pshilovsky@samba.org> | 2013-07-05 04:00:30 -0400 |
---|---|---|
committer | Steve French <smfrench@gmail.com> | 2013-07-10 14:08:40 -0400 |
commit | 226730b4d8adae393dc07092655cdd29d2a2ff07 (patch) | |
tree | eda0aef086114d0309d669e01c22a0ec5d987cc5 /fs/cifs/dir.c | |
parent | 63eb3def3267a5744863801e8221898b0ba9d41d (diff) |
CIFS: Introduce cifs_open_parms struct
and pass it to the open() call.
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steven French <steven@steven-GA-970A-DS3.(none)>
Diffstat (limited to 'fs/cifs/dir.c')
-rw-r--r-- | fs/cifs/dir.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index 5175aebf6737..c27c242ac5ba 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c | |||
@@ -204,6 +204,7 @@ cifs_do_create(struct inode *inode, struct dentry *direntry, unsigned int xid, | |||
204 | struct inode *newinode = NULL; | 204 | struct inode *newinode = NULL; |
205 | int disposition; | 205 | int disposition; |
206 | struct TCP_Server_Info *server = tcon->ses->server; | 206 | struct TCP_Server_Info *server = tcon->ses->server; |
207 | struct cifs_open_parms oparms; | ||
207 | 208 | ||
208 | *oplock = 0; | 209 | *oplock = 0; |
209 | if (tcon->ses->server->oplocks) | 210 | if (tcon->ses->server->oplocks) |
@@ -319,9 +320,15 @@ cifs_do_create(struct inode *inode, struct dentry *direntry, unsigned int xid, | |||
319 | if (backup_cred(cifs_sb)) | 320 | if (backup_cred(cifs_sb)) |
320 | create_options |= CREATE_OPEN_BACKUP_INTENT; | 321 | create_options |= CREATE_OPEN_BACKUP_INTENT; |
321 | 322 | ||
322 | rc = server->ops->open(xid, tcon, full_path, disposition, | 323 | oparms.tcon = tcon; |
323 | desired_access, create_options, fid, oplock, | 324 | oparms.cifs_sb = cifs_sb; |
324 | buf, cifs_sb); | 325 | oparms.desired_access = desired_access; |
326 | oparms.create_options = create_options; | ||
327 | oparms.disposition = disposition; | ||
328 | oparms.path = full_path; | ||
329 | oparms.fid = fid; | ||
330 | |||
331 | rc = server->ops->open(xid, &oparms, oplock, buf); | ||
325 | if (rc) { | 332 | if (rc) { |
326 | cifs_dbg(FYI, "cifs_create returned 0x%x\n", rc); | 333 | cifs_dbg(FYI, "cifs_create returned 0x%x\n", rc); |
327 | goto out; | 334 | goto out; |