summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2013-09-02 12:33:40 +0000
committerMichael Adam <obnox@samba.org>2013-10-15 23:38:27 +0200
commitc33015c069de285cf6e14bacb1e3a7937e466ef3 (patch)
treef49dfecdd907715bc4ec3df2ccb5b9cb8d27bc97 /source3
parentf50b6da7d5862aa8d4a3ea04df9b9121b083e2a8 (diff)
downloadsamba-c33015c069de285cf6e14bacb1e3a7937e466ef3.tar.gz
samba-c33015c069de285cf6e14bacb1e3a7937e466ef3.tar.bz2
samba-c33015c069de285cf6e14bacb1e3a7937e466ef3.zip
smbd: Simplify find_oplock_types a bit
Define a variable to dereference lck->data just once. Believe it or not, this saves a few bytes .o with -O3 :-) Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/open.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 93b69d5afd..29c6eb525d 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1217,6 +1217,7 @@ static void find_oplock_types(files_struct *fsp,
bool *got_level2,
bool *got_no_oplock)
{
+ struct share_mode_data *d = lck->data;
int i;
*pp_batch = NULL;
@@ -1232,8 +1233,8 @@ static void find_oplock_types(files_struct *fsp,
return;
}
- for (i=0; i<lck->data->num_share_modes; i++) {
- struct share_mode_entry *e = &lck->data->share_modes[i];
+ for (i=0; i<d->num_share_modes; i++) {
+ struct share_mode_entry *e = &d->share_modes[i];
if (!is_valid_share_mode_entry(e)) {
continue;
@@ -1248,7 +1249,7 @@ static void find_oplock_types(files_struct *fsp,
if (BATCH_OPLOCK_TYPE(e->op_type)) {
/* batch - can only be one. */
- if (share_mode_stale_pid(lck->data, i)) {
+ if (share_mode_stale_pid(d, i)) {
DEBUG(10, ("Found stale batch oplock\n"));
continue;
}
@@ -1259,7 +1260,7 @@ static void find_oplock_types(files_struct *fsp,
}
if (EXCLUSIVE_OPLOCK_TYPE(e->op_type)) {
- if (share_mode_stale_pid(lck->data, i)) {
+ if (share_mode_stale_pid(d, i)) {
DEBUG(10, ("Found stale duplicate oplock\n"));
continue;
}
@@ -1272,7 +1273,7 @@ static void find_oplock_types(files_struct *fsp,
if (LEVEL_II_OPLOCK_TYPE(e->op_type)) {
if (*pp_batch || *pp_ex_or_batch) {
- if (share_mode_stale_pid(lck->data, i)) {
+ if (share_mode_stale_pid(d, i)) {
DEBUG(10, ("Found stale LevelII "
"oplock\n"));
continue;
@@ -1284,7 +1285,7 @@ static void find_oplock_types(files_struct *fsp,
if (e->op_type == NO_OPLOCK) {
if (*pp_batch || *pp_ex_or_batch) {
- if (share_mode_stale_pid(lck->data, i)) {
+ if (share_mode_stale_pid(d, i)) {
DEBUG(10, ("Found stale NO_OPLOCK "
"entry\n"));
continue;