summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2012-06-06 15:42:48 +0200
committerMichael Adam <obnox@samba.org>2012-06-06 23:21:59 +0200
commit1c01cb45101a2f0193921ba967f800bdf6bb83cb (patch)
tree7a13ec49b74d1ae98bdd720b6802f9a58ea99359
parentfab660780ab5f3afda11ae3daee8f50571fc4145 (diff)
downloadsamba-1c01cb45101a2f0193921ba967f800bdf6bb83cb.tar.gz
samba-1c01cb45101a2f0193921ba967f800bdf6bb83cb.tar.bz2
samba-1c01cb45101a2f0193921ba967f800bdf6bb83cb.zip
s3:include: change lock_struct->fnum to uint64_t
Note: this changes the format of brlock.tdb! Pair-Programmed-With: Stefan Metzmacher <metze@samba.org> Autobuild-User: Michael Adam <obnox@samba.org> Autobuild-Date: Wed Jun 6 23:22:00 CEST 2012 on sn-devel-104
-rw-r--r--source3/include/locking.h2
-rw-r--r--source3/locking/brlock.c4
-rw-r--r--source3/locking/locking.c4
-rw-r--r--source3/locking/posix.c3
4 files changed, 7 insertions, 6 deletions
diff --git a/source3/include/locking.h b/source3/include/locking.h
index 8ece11c920..32593af181 100644
--- a/source3/include/locking.h
+++ b/source3/include/locking.h
@@ -66,7 +66,7 @@ struct lock_struct {
struct lock_context context;
br_off start;
br_off size;
- uint16 fnum;
+ uint64_t fnum;
enum brl_type lock_type;
enum brl_flavour lock_flav;
};
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index adf1f5194c..b82914a0f8 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -54,10 +54,10 @@ static void print_lock_struct(unsigned int i, struct lock_struct *pls)
(unsigned int)pls->context.tid,
server_id_str(talloc_tos(), &pls->context.pid) ));
- DEBUG(10,("start = %.0f, size = %.0f, fnum = %d, %s %s\n",
+ DEBUG(10,("start = %.0f, size = %.0f, fnum = %llu, %s %s\n",
(double)pls->start,
(double)pls->size,
- pls->fnum,
+ (unsigned long long)pls->fnum,
lock_type_name(pls->lock_type),
lock_flav_name(pls->lock_flav) ));
}
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 5da7595737..5553702274 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -154,11 +154,11 @@ bool strict_lock_default(files_struct *fsp, struct lock_struct *plock)
}
DEBUG(10,("strict_lock_default: flavour = %s brl start=%.0f "
- "len=%.0f %s for fnum %d file %s\n",
+ "len=%.0f %s for fnum %llu file %s\n",
lock_flav_name(plock->lock_flav),
(double)plock->start, (double)plock->size,
ret ? "unlocked" : "locked",
- plock->fnum, fsp_str_dbg(fsp)));
+ (unsigned long long)plock->fnum, fsp_str_dbg(fsp)));
return ret;
}
diff --git a/source3/locking/posix.c b/source3/locking/posix.c
index 557099b2d8..2a274f9a00 100644
--- a/source3/locking/posix.c
+++ b/source3/locking/posix.c
@@ -791,7 +791,8 @@ static struct lock_list *posix_lock_list(TALLOC_CTX *ctx,
for (l_curr = lhead; l_curr;) {
- DEBUG(10,("posix_lock_list: lock: fnum=%d: start=%.0f,size=%.0f:type=%s", lock->fnum,
+ DEBUG(10,("posix_lock_list: lock: fnum=%llu: start=%.0f,size=%.0f:type=%s",
+ (unsigned long long)lock->fnum,
(double)lock->start, (double)lock->size, posix_lock_type_name(lock->lock_type) ));
if ( (l_curr->start >= (lock->start + lock->size)) ||