diff options
Diffstat (limited to 'module/os/linux/zfs')
| -rw-r--r-- | module/os/linux/zfs/zfs_acl.c | 2 | ||||
| -rw-r--r-- | module/os/linux/zfs/zvol_os.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/module/os/linux/zfs/zfs_acl.c b/module/os/linux/zfs/zfs_acl.c index 4fd071d3c..5935403b4 100644 --- a/module/os/linux/zfs/zfs_acl.c +++ b/module/os/linux/zfs/zfs_acl.c @@ -525,7 +525,7 @@ zfs_acl_valid_ace_type(uint_t type, uint_t flags) entry_type == ACE_EVERYONE || entry_type == 0 || entry_type == ACE_IDENTIFIER_GROUP); default: - if (type >= MIN_ACE_TYPE && type <= MAX_ACE_TYPE) + if (type <= MAX_ACE_TYPE) return (B_TRUE); } return (B_FALSE); diff --git a/module/os/linux/zfs/zvol_os.c b/module/os/linux/zfs/zvol_os.c index 8904dc5bb..0d4e0dcd5 100644 --- a/module/os/linux/zfs/zvol_os.c +++ b/module/os/linux/zfs/zvol_os.c @@ -1433,7 +1433,7 @@ zvol_os_create_minor(const char *name) * Prefetching the blocks commonly scanned by blkid(8) will speed * up this process. */ - len = MIN(MAX(zvol_prefetch_bytes, 0), SPA_MAXBLOCKSIZE); + len = MIN(zvol_prefetch_bytes, SPA_MAXBLOCKSIZE); if (len > 0) { dmu_prefetch(os, ZVOL_OBJ, 0, 0, len, ZIO_PRIORITY_SYNC_READ); dmu_prefetch(os, ZVOL_OBJ, 0, volsize - len, len, |