From c33015c069de285cf6e14bacb1e3a7937e466ef3 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 2 Sep 2013 12:33:40 +0000 Subject: [PATCH] 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 Reviewed-by: Michael Adam --- source3/smbd/open.c | 13 +++++++------ 1 file 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; idata->num_share_modes; i++) { - struct share_mode_entry *e = &lck->data->share_modes[i]; + for (i=0; inum_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; -- 2.34.1