Remove redundant connection_struct from fd_close_posix() parameter list.

Michael
(This used to be commit f3365b74ac016eaee1e82eef769dd618af5df201)

diff --git a/source3/locking/posix.c b/source3/locking/posix.c
index aef5c1784ff3ba3b793bafcc1299abf5124320a6..207ee57ce1caa06d40c828aa093b5f8d84641bb6 100644 (file)
--- a/source3/locking/posix.c
+++ b/source3/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/source3/smbd/open.c b/source3/smbd/open.c
index b83d6844d6e907c46932ad03ae1dd35e6552c2ad..743f040911184d93a9b3ee17f7c81017294dd649 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/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);
 }
 
 /****************************************************************************