Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d8c4c00 authored by Pavel Shilovsky's avatar Pavel Shilovsky Committed by Steve French
Browse files

CIFS: Make flush code use ops struct 



Signed-off-by: default avatarPavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent 2ae78ba8

fs/cifs/cifsglob.h

+2 −0
Original line number Diff line number Diff line
@@ -274,6 +274,8 @@ struct smb_version_operations { 
	void (*set_fid)(struct cifsFileInfo *, struct cifs_fid *, __u32);

	/* close a file */

	int (*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 *);

};



struct smb_version_values {

fs/cifs/file.c

+16 −4
Original line number Diff line number Diff line
@@ -2062,6 +2062,7 @@ int cifs_strict_fsync(struct file *file, loff_t start, loff_t end, 
	unsigned int xid;

	int rc = 0;

	struct cifs_tcon *tcon;

	struct TCP_Server_Info *server;

	struct cifsFileInfo *smbfile = file->private_data;

	struct inode *inode = file->f_path.dentry->d_inode;

	struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
@@ -2085,8 +2086,13 @@ int cifs_strict_fsync(struct file *file, loff_t start, loff_t end, 
	}



	tcon = tlink_tcon(smbfile->tlink);

	if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOSSYNC))

		rc = CIFSSMBFlush(xid, tcon, smbfile->fid.netfid);

	if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOSSYNC)) {

		server = tcon->ses->server;

		if (server->ops->flush)

			rc = server->ops->flush(xid, tcon, &smbfile->fid);

		else

			rc = -ENOSYS;

	}



	free_xid(xid);

	mutex_unlock(&inode->i_mutex);
@@ -2098,6 +2104,7 @@ int cifs_fsync(struct file *file, loff_t start, loff_t end, int datasync) 
	unsigned int xid;

	int rc = 0;

	struct cifs_tcon *tcon;

	struct TCP_Server_Info *server;

	struct cifsFileInfo *smbfile = file->private_data;

	struct cifs_sb_info *cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);

	struct inode *inode = file->f_mapping->host;
@@ -2113,8 +2120,13 @@ int cifs_fsync(struct file *file, loff_t start, loff_t end, int datasync) 
		file->f_path.dentry->d_name.name, datasync);



	tcon = tlink_tcon(smbfile->tlink);

	if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOSSYNC))

		rc = CIFSSMBFlush(xid, tcon, smbfile->fid.netfid);

	if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOSSYNC)) {

		server = tcon->ses->server;

		if (server->ops->flush)

			rc = server->ops->flush(xid, tcon, &smbfile->fid);

		else

			rc = -ENOSYS;

	}



	free_xid(xid);

	mutex_unlock(&inode->i_mutex);

fs/cifs/smb1ops.c

+8 −0
Original line number Diff line number Diff line
@@ -648,6 +648,13 @@ cifs_close_file(const unsigned int xid, struct cifs_tcon *tcon, 
	return CIFSSMBClose(xid, tcon, fid->netfid);

}



static int

cifs_flush_file(const unsigned int xid, struct cifs_tcon *tcon,

		struct cifs_fid *fid)

{

	return CIFSSMBFlush(xid, tcon, fid->netfid);

}



struct smb_version_operations smb1_operations = {

	.send_cancel = send_nt_cancel,

	.compare_fids = cifs_compare_fids,
@@ -691,6 +698,7 @@ struct smb_version_operations smb1_operations = { 
	.open = cifs_open_file,

	.set_fid = cifs_set_fid,

	.close = cifs_close_file,

	.flush = cifs_flush_file,

};



struct smb_version_values smb1_values = {