Remove unnecessary equality check

Currently `if` statement includes an assignment (from a function return
value) and a equality check. The parenthesis are in the incorrect place,
currently the code clobbers the function return value because of this.

We can fix this by simplifying the `if` statement.

`if (foo != 0)`

can be more succinctly expressed as

`if (foo)`

Remove the equality check, add parenthesis to correct the statement.

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 #6685
Close #6719

diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c
index 259bfb3091320d2f22149311010d41bac8f364cd..a88f2482e722043e81cffe746b1786b1ecea8bd4 100644 (file)
--- a/module/zfs/zfs_vnops.c
+++ b/module/zfs/zfs_vnops.c
@@ -4562,7 +4562,7 @@ convoff(struct inode *ip, flock64_t *lckdat, int  whence, offset_t offset)
        int error;
 
        if ((lckdat->l_whence == 2) || (whence == 2)) {
-               if ((error = zfs_getattr(ip, &vap, 0, CRED()) != 0))
+               if ((error = zfs_getattr(ip, &vap, 0, CRED())))
                        return (error);
        }