openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

CIFS: Move close code to ops struct 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/cifs/cifsglob.h
View File

@ -269,6 +269,8 @@ struct smb_version_operations {
struct cifs_sb_info *);
/* set fid protocol-specific info */
void (*set_fid)(struct cifsFileInfo *, struct cifs_fid *, __u32);
/* close a file */
int (*close)(const unsigned int, struct cifs_tcon *, struct cifs_fid *);
};
struct smb_version_values {

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;
}

8
fs/cifs/smb1ops.c
View File

@ -634,6 +634,13 @@ cifs_set_fid(struct cifsFileInfo *cfile, struct cifs_fid *fid, __u32 oplock)
cinode->can_cache_brlcks = cinode->clientCanCacheAll;
}
static int
cifs_close_file(const unsigned int xid, struct cifs_tcon *tcon,
struct cifs_fid *fid)
{
return CIFSSMBClose(xid, tcon, fid->netfid);
}
struct smb_version_operations smb1_operations = {
.send_cancel = send_nt_cancel,
.compare_fids = cifs_compare_fids,
@ -675,6 +682,7 @@ struct smb_version_operations smb1_operations = {
.rename_pending_delete = cifs_rename_pending_delete,
.open = cifs_open_file,
.set_fid = cifs_set_fid,
.close = cifs_close_file,
};
struct smb_version_values smb1_values = {