From: Michael Adam <obnox@samba.org>
Date: Sat, 22 Dec 2007 00:49:29 +0000 (+0100)
Subject: Remove redundant connection_struct from fd_close_posix() parameter list.
X-Git-Tag: samba-3.2.0pre2~128^2~2
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=f3365b74ac016eaee1e82eef769dd618af5df201;p=samba.git

Remove redundant connection_struct from fd_close_posix() parameter list.

Michael
---

diff --git a/source/locking/posix.c b/source/locking/posix.c
index aef5c1784ff..207ee57ce1c 100644
--- a/source/locking/posix.c
+++ b/source/locking/posix.c
@@ -607,14 +607,14 @@ static size_t get_posix_pending_close_entries(TALLOC_CTX *mem_ctx,
  to delete all locks on this fsp before this function is called.
 ****************************************************************************/
 
-NTSTATUS fd_close_posix(struct connection_struct *conn, files_struct *fsp)
+NTSTATUS fd_close_posix(struct files_struct *fsp)
 {
 	int saved_errno = 0;
 	int ret;
 	int *fd_array = NULL;
 	size_t count, i;
 
-	if (!lp_locking(fsp->conn->params) || !lp_posix_locking(conn->params)) {
+	if (!lp_locking(fsp->conn->params) || !lp_posix_locking(fsp->conn->params)) {
 		/*
 		 * No locking or POSIX to worry about or we want POSIX semantics
 		 * which will lose all locks on all fd's open on this dev/inode,
diff --git a/source/smbd/open.c b/source/smbd/open.c
index b83d6844d6e..743f0409111 100644
--- a/source/smbd/open.c
+++ b/source/smbd/open.c
@@ -78,7 +78,7 @@ NTSTATUS fd_close(struct connection_struct *conn, files_struct *fsp)
 	if (fsp->fh->ref_count > 1) {
 		return NT_STATUS_OK; /* Shared handle. Only close last reference. */
 	}
-	return fd_close_posix(conn, fsp);
+	return fd_close_posix(fsp);
 }
 
 /****************************************************************************