Commit 760ad0ca authored by Pavel Shilovsky's avatar Pavel Shilovsky Committed by Steve French
Browse files

CIFS: Make ops->close return void 



Signed-off-by: default avatarPavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent 4f2b86ab

fs/cifs/cifsglob.h

+2 −1
Original line number Diff line number Diff line
@@ -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 */

fs/cifs/file.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

fs/cifs/smb1ops.c

+2 −2
Original line number Diff line number Diff line
@@ -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

fs/cifs/smb2ops.c

+2 −2
Original line number Diff line number Diff line
@@ -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