xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CIFS: Move close code to ops struct

Browse Source 
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>
This commit is contained in:
Pavel Shilovsky
2012-09-18 16:20:26 -07:00
committed by Steve French
parent fb1214e48f
commit 0ff78a221b
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fs/cifs/file.c
View File

@@ -326,10 +326,13 @@ void cifsFileInfo_put(struct cifsFileInfo *cifs_file)
cancel_work_sync(&cifs_file->oplock_break);
if (!tcon->need_reconnect && !cifs_file->invalidHandle) {
struct TCP_Server_Info *server = tcon->ses->server;
unsigned int xid;
int rc;
int rc = -ENOSYS;
xid = get_xid();
rc = CIFSSMBClose(xid, tcon, cifs_file->fid.netfid);
if (server->ops->close)
rc = server->ops->close(xid, tcon, &cifs_file->fid);
free_xid(xid);
}
@@ -423,7 +426,8 @@ int cifs_open(struct inode *inode, struct file *file)
cfile = cifs_new_fileinfo(&fid, file, tlink, oplock);
if (cfile == NULL) {
CIFSSMBClose(xid, tcon, fid.netfid);
if (tcon->ses->server->ops->close)
tcon->ses->server->ops->close(xid, tcon, &fid);
rc = -ENOMEM;
goto out;
}