git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 'statement with no effect' warning
[zfs.git]
/
module
/
zfs
/
zfs_vnops.c
diff --git
a/module/zfs/zfs_vnops.c
b/module/zfs/zfs_vnops.c
index
8bff0ef
..
821ecec
100644
(file)
--- a/
module/zfs/zfs_vnops.c
+++ b/
module/zfs/zfs_vnops.c
@@
-2274,7
+2274,7
@@
top:
/*
* Remove setuid/setgid for non-privileged users
*/
/*
* Remove setuid/setgid for non-privileged users
*/
- secpolicy_setid_clear(attr, cr);
+
(void)
secpolicy_setid_clear(attr, cr);
trim_mask = (mask & (ATTR_UID|ATTR_GID));
} else {
need_policy = TRUE;
trim_mask = (mask & (ATTR_UID|ATTR_GID));
} else {
need_policy = TRUE;
@@
-2575,7
+2575,7
@@
out:
} else {
err2 = sa_bulk_update(zp->z_sa_hdl, bulk, count, tx);
dmu_tx_commit(tx);
} else {
err2 = sa_bulk_update(zp->z_sa_hdl, bulk, count, tx);
dmu_tx_commit(tx);
-
zfs_inode_update(zp);
+ zfs_inode_update(zp);
}
out2:
}
out2:
@@
-3169,7
+3169,6
@@
top:
zfs_dirent_unlock(dl);
*ipp = ZTOI(zp);
zfs_dirent_unlock(dl);
*ipp = ZTOI(zp);
- iput(ZTOI(zp));
if (zsb->z_os->os_sync == ZFS_SYNC_ALWAYS)
zil_commit(zilog, 0);
if (zsb->z_os->os_sync == ZFS_SYNC_ALWAYS)
zil_commit(zilog, 0);