c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 19:19:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use bitwise '&' instead of logical '&&'

Browse Source 
Make two instances of the same change. Change bitwise AND (&) to logical
AND (&&).

Currently the code uses a bitwise AND between two boolean values.

In the first instance;

The first operand is a flag that has been bitwise combined with a bit
mask to get a boolean value as to whether a file has group write
permissions set.

The second operand used is a struct member that is intended as a
boolean flag not a bit mask.

In the second instance the argument is the same except with world write
permissions instead of group write (S_IWOTH, S_IWGRP).

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Chris Dunlop <chris@onthe.net.au>
Signed-off-by: Tobin C. Harding <me@tobin.cc>
Closes #6684 
Closes #6722
This commit is contained in:
Tobin Harding 2017-10-06 13:38:55 +11:00 committed by Brian Behlendorf
parent d95a59805f
commit a0430cc5a9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/zed/zed_conf.c
View File

@ -394,13 +394,13 @@ zed_conf_scan_dir(struct zed_conf *zcp)
direntp->d_name); direntp->d_name);
continue; continue;
} }
if ((st.st_mode & S_IWGRP) & !zcp->do_force) { if ((st.st_mode & S_IWGRP) && !zcp->do_force) {
zed_log_msg(LOG_NOTICE, zed_log_msg(LOG_NOTICE,
"Ignoring \"%s\": writable by group", "Ignoring \"%s\": writable by group",
direntp->d_name); direntp->d_name);
continue; continue;
} }
if ((st.st_mode & S_IWOTH) & !zcp->do_force) { if ((st.st_mode & S_IWOTH) && !zcp->do_force) {
zed_log_msg(LOG_NOTICE, zed_log_msg(LOG_NOTICE,
"Ignoring \"%s\": writable by other", "Ignoring \"%s\": writable by other",
direntp->d_name); direntp->d_name);