diff options
| author | Michael Adam <obnox@samba.org> | 2007-12-22 01:49:29 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2007-12-22 02:01:32 +0100 |
| commit | 4773973300d9b4c6d46bdeefd57d200378f6cec3 (patch) | |
| tree | daa4b2e61bb8e89dd14c161cd80233ab6662d4f2 | |
| parent | 98bc591c4fac3a26796c596b55b735739d96c76b (diff) | |
| download | samba-4773973300d9b4c6d46bdeefd57d200378f6cec3.tar.gz samba-4773973300d9b4c6d46bdeefd57d200378f6cec3.tar.bz2 samba-4773973300d9b4c6d46bdeefd57d200378f6cec3.zip | |
Remove redundant connection_struct from fd_close_posix() parameter list.
Michael
(This used to be commit f3365b74ac016eaee1e82eef769dd618af5df201)
| -rw-r--r-- | source3/locking/posix.c | 4 | ||||
| -rw-r--r-- | source3/smbd/open.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/locking/posix.c b/source3/locking/posix.c index aef5c1784f..207ee57ce1 100644 --- 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 b83d6844d6..743f040911 100644 --- 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); } /**************************************************************************** |