CIFS: Make ops->close return void
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru> Signed-off-by: Steve French <smfrench@gmail.com>
This commit is contained in:
Родитель
4f2b86aba8
Коммит
760ad0cac1
|
@ -316,7 +316,8 @@ struct smb_version_operations {
|
|||
/* 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 *);
|
||||
void (*close)(const unsigned int, struct cifs_tcon *,
|
||||
struct cifs_fid *);
|
||||
/* send a flush request to the server */
|
||||
int (*flush)(const unsigned int, struct cifs_tcon *, struct cifs_fid *);
|
||||
/* async read from the server */
|
||||
|
|
|
@ -355,12 +355,11 @@ void cifsFileInfo_put(struct cifsFileInfo *cifs_file)
|
|||
if (!tcon->need_reconnect && !cifs_file->invalidHandle) {
|
||||
struct TCP_Server_Info *server = tcon->ses->server;
|
||||
unsigned int xid;
|
||||
int rc = -ENOSYS;
|
||||
|
||||
xid = get_xid();
|
||||
if (server->ops->close)
|
||||
rc = server->ops->close(xid, tcon, &cifs_file->fid);
|
||||
free_xid(xid);
|
||||
server->ops->close(xid, tcon, &cifs_file->fid);
|
||||
_free_xid(xid);
|
||||
}
|
||||
|
||||
cifs_del_pending_open(&open);
|
||||
|
|
|
@ -720,11 +720,11 @@ cifs_set_fid(struct cifsFileInfo *cfile, struct cifs_fid *fid, __u32 oplock)
|
|||
cinode->can_cache_brlcks = cinode->clientCanCacheAll;
|
||||
}
|
||||
|
||||
static int
|
||||
static void
|
||||
cifs_close_file(const unsigned int xid, struct cifs_tcon *tcon,
|
||||
struct cifs_fid *fid)
|
||||
{
|
||||
return CIFSSMBClose(xid, tcon, fid->netfid);
|
||||
CIFSSMBClose(xid, tcon, fid->netfid);
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
|
@ -374,11 +374,11 @@ smb2_set_fid(struct cifsFileInfo *cfile, struct cifs_fid *fid, __u32 oplock)
|
|||
cinode->can_cache_brlcks = cinode->clientCanCacheAll;
|
||||
}
|
||||
|
||||
static int
|
||||
static void
|
||||
smb2_close_file(const unsigned int xid, struct cifs_tcon *tcon,
|
||||
struct cifs_fid *fid)
|
||||
{
|
||||
return SMB2_close(xid, tcon, fid->persistent_fid, fid->volatile_fid);
|
||||
SMB2_close(xid, tcon, fid->persistent_fid, fid->volatile_fid);
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
Загрузка…
Ссылка в новой задаче