summaryrefslogtreecommitdiff
path: root/source3/locking
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-06-28 01:37:19 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:58:05 -0500
commit74563c5806c23735a90b4ab3323ffa9875dce609 (patch)
treea45d4ec7f9c57c4e756ffbd43e41f684319c809e /source3/locking
parent3d306127aaa69d22d8494fa291e3feaa15bcde53 (diff)
downloadsamba-74563c5806c23735a90b4ab3323ffa9875dce609.tar.gz
samba-74563c5806c23735a90b4ab3323ffa9875dce609.tar.bz2
samba-74563c5806c23735a90b4ab3323ffa9875dce609.zip
r7975: One more tidyup to ensure we're using "struct posix_lock".
Jeremy. (This used to be commit 960a5d37d1cfa25e4f7491b175dab68ac9f37c43)
Diffstat (limited to 'source3/locking')
-rw-r--r--source3/locking/posix.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/locking/posix.c b/source3/locking/posix.c
index 3859896c47..218c441028 100644
--- a/source3/locking/posix.c
+++ b/source3/locking/posix.c
@@ -102,6 +102,7 @@ static BOOL add_fd_to_close_entry(files_struct *fsp)
char *tp;
dbuf.dptr = NULL;
+ dbuf.dsize = 0;
dbuf = tdb_fetch(posix_pending_close_tdb, kbuf);
@@ -330,7 +331,7 @@ static BOOL delete_posix_lock_entry_by_index(files_struct *fsp, size_t entry)
tdb_delete(posix_lock_tdb, kbuf);
} else {
if (entry < count-1) {
- memmove(&locks[entry], &locks[entry+1], sizeof(*locks)*((count-1) - entry));
+ memmove(&locks[entry], &locks[entry+1], sizeof(struct posix_lock)*((count-1) - entry));
}
dbuf.dsize -= sizeof(struct posix_lock);
tdb_store(posix_lock_tdb, kbuf, dbuf, TDB_REPLACE);