[PATCH] Remove unused argument

[Ralph Boehme]

On Mon, Oct 12, 2015 at 01:17:34PM +0200, Volker Lendecke wrote:
> On Mon, Oct 12, 2015 at 01:05:54PM +0200, Ralph Boehme wrote:
> > On Mon, Oct 12, 2015 at 12:57:54PM +0200, Ralph Boehme wrote:
> > > Hi
> > > 
> > > remove an unused argument in disposition_to_open_flags().
> > > 
> > > Please review & push if ok. Thanks!
> > 
> > sorry, ENOPATCH. Here it is.
> 
> Sorry, but this does not build for me. The function
> prototype is changed, but the caller ist not. Is it possible
> that some hunk is missing?

yes, sorry. Patchv2 attached.

-Ralph

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de,mailto:kontakt@sernet.de
-------------- next part --------------
From 379ed35ac804e4da3fffd3325e741827592baef6 Mon Sep 17 00:00:00 2001
From: Ralph Boehme <slow at samba.org>
Date: Wed, 7 Oct 2015 14:28:32 +0200
Subject: [PATCH] s3:smbd: remove unused arg oplock_request

The use of oplock_request in calculate_open_access_flags() was removed
in 196da5925.

Signed-off-by: Ralph Boehme <slow at samba.org>
---
 source3/smbd/open.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 162e834..ef1505d 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2354,7 +2354,6 @@ static int disposition_to_open_flags(uint32_t create_disposition)
 }
 
 static int calculate_open_access_flags(uint32_t access_mask,
-				       int oplock_request,
 				       uint32_t private_flags)
 {
 	bool need_write, need_read;
@@ -2641,8 +2640,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
 	 * mean the same thing under DOS and Unix.
 	 */
 
-	flags = calculate_open_access_flags(access_mask, oplock_request,
-					    private_flags);
+	flags = calculate_open_access_flags(access_mask, private_flags);
 
 	/*
 	 * Currently we only look at FILE_WRITE_THROUGH for create options.
-- 
2.1.0