[03/12] cifs: change unlink to use a compound

Message ID	20180903033352.29586-4-lsahlber@redhat.com
State	New
Headers	show Return-Path: <linux-cifs-owner@vger.kernel.org> From: Ronnie Sahlberg <lsahlber@redhat.com> To: linux-cifs <linux-cifs@vger.kernel.org> Cc: Steve French <smfrench@gmail.com> Subject: [PATCH 03/12] cifs: change unlink to use a compound Date: Mon, 3 Sep 2018 13:33:43 +1000 Message-Id: <20180903033352.29586-4-lsahlber@redhat.com> In-Reply-To: <20180903033352.29586-1-lsahlber@redhat.com> References: <20180903033352.29586-1-lsahlber@redhat.com> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk
Series	cifs compounding \| expand [0/12] cifs compounding [01/12] cifs: add a smb2_compound_op and change QUERY_INFO to use it [02/12] cifs: change mkdir to use a compound [03/12] cifs: change unlink to use a compound [04/12] cifs: create helpers for SMB2_set_info_init/free() [05/12] cifs: make rmdir() use compounding [06/12] cifs: change SMB2_OP_SET_EOF to use compounding [07/12] cifs: remove the is_falloc argument to SMB2_set_eof [08/12] cifs: change SMB2_OP_SET_INFO to use compounding [09/12] cifs: change SMB2_OP_RENAME and SMB2_OP_HARDLINK to use compounding [10/12] cifs: create a define for the max number of iov we need for a SMB2 set_info [11/12] cifs: add a warning if we try to to dequeue a deleted mid [12/12] cifs: only wake the thread for the very last PDU in a compound

Message ID

20180903033352.29586-4-lsahlber@redhat.com

State

New

Headers

From: Ronnie Sahlberg <lsahlber@redhat.com>
To: linux-cifs <linux-cifs@vger.kernel.org>
Cc: Steve French <smfrench@gmail.com>
Subject: [PATCH 03/12] cifs: change unlink to use a compound
Date: Mon,  3 Sep 2018 13:33:43 +1000
Message-Id: <20180903033352.29586-4-lsahlber@redhat.com>
In-Reply-To: <20180903033352.29586-1-lsahlber@redhat.com>
References: <20180903033352.29586-1-lsahlber@redhat.com>
Sender: linux-cifs-owner@vger.kernel.org
Precedence: bulk

Series

cifs compounding | expand

Commit Message

Ronnie Sahlberg Sept. 3, 2018, 3:33 a.m. UTC

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

Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
---
 fs/cifs/smb2inode.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/fs/cifs/smb2inode.c b/fs/cifs/smb2inode.c
index 9a742164b5f1..78e511c42788 100644
--- a/fs/cifs/smb2inode.c
+++ b/fs/cifs/smb2inode.c
@@ -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,9 +331,9 @@  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,
-				  CREATE_DELETE_ON_CLOSE | OPEN_REPARSE_POINT,
-				  NULL, SMB2_OP_DELETE);
+	return smb2_compound_op(xid, tcon, cifs_sb, name, DELETE, FILE_OPEN,
+				CREATE_DELETE_ON_CLOSE | OPEN_REPARSE_POINT,
+				NULL, SMB2_OP_DELETE);
 }
 
 static int

[03/12] cifs: change unlink to use a compound

Commit Message

Patch