Commit 47dd9597 authored by Ronnie Sahlberg's avatar Ronnie Sahlberg Committed by Steve French
Browse files

cifs: change unlink to use a compound 



This,and previous patches, drops the number of roundtrips from five to two
for unlink()

Signed-off-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent f733e393

fs/cifs/smb2inode.c

+6 −5
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon, 
		smb2_set_next_command(server, &rqst[num_rqst]);

		smb2_set_related(&rqst[num_rqst++]);

		break;

	case SMB2_OP_DELETE:

		break;

	case SMB2_OP_MKDIR:

		/*

		 * Directories are created through parameters in the
@@ -148,6 +150,7 @@ smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon, 
		if (rqst[2].rq_iov)

			SMB2_close_free(&rqst[2]);

		break;

	case SMB2_OP_DELETE:

	case SMB2_OP_MKDIR:

		if (rqst[1].rq_iov)

			SMB2_close_free(&rqst[1]);
@@ -202,8 +205,6 @@ smb2_open_op_close(const unsigned int xid, struct cifs_tcon *tcon, 
	}



	switch (command) {

	case SMB2_OP_DELETE:

		break;

	case SMB2_OP_RMDIR:

		tmprc = SMB2_rmdir(xid, tcon, fid.persistent_fid,

				   fid.volatile_fid);
@@ -330,7 +331,7 @@ int 
smb2_unlink(const unsigned int xid, struct cifs_tcon *tcon, const char *name,

	    struct cifs_sb_info *cifs_sb)

{

	return smb2_open_op_close(xid, tcon, cifs_sb, name, DELETE, FILE_OPEN,

	return smb2_compound_op(xid, tcon, cifs_sb, name, DELETE, FILE_OPEN,

				CREATE_DELETE_ON_CLOSE | OPEN_REPARSE_POINT,

				NULL, SMB2_OP_DELETE);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE