diff options
| author | Chris Dunlop <[email protected]> | 2016-07-15 00:44:38 +1000 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-07-14 16:25:34 -0700 |
| commit | dfbc86309fd8ebb70a55cafa876320dc1ea8e833 (patch) | |
| tree | 32c1b694d9d6b6bd89db7b3041cd459bc4e44541 /module/zfs/zfs_sa.c | |
| parent | 02de3e3c5d54bd545b34cccfd35ace80edd1f864 (diff) | |
Use native inode->i_nlink instead of znode->z_links
A mostly mechanical change, taking into account i_nlink is 32 bits vs ZFS's
64 bit on-disk link count.
We revert "xattr dir doesn't get purged during iput" (ddae16a) as this is a
more Linux-integrated fix for the same issue.
In addition, setting the initial link count on a new node has been changed
from setting one less than required in zfs_mknode() then incrementing to the
correct count in zfs_link_create() (which was somewhat bizarre in the first
place), to setting the correct count in zfs_mknode() and not incrementing it
in zfs_link_create(). This both means we no longer set the link count in
sa_bulk_update() twice (once for the initial incorrect count then again for
the correct count), as well as adhering to the Linux requirement of not
incrementing a zero link count without I_LINKABLE (see linux commit
f4e0c30c).
Signed-off-by: Chris Dunlop <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Signed-off-by: Chunwei Chen <[email protected]>
Closes #4838
Issue #227
Diffstat (limited to 'module/zfs/zfs_sa.c')
| -rw-r--r-- | module/zfs/zfs_sa.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/module/zfs/zfs_sa.c b/module/zfs/zfs_sa.c index f3eac51f8..33b767808 100644 --- a/module/zfs/zfs_sa.c +++ b/module/zfs/zfs_sa.c @@ -277,6 +277,7 @@ zfs_sa_upgrade(sa_handle_t *hdl, dmu_tx_t *tx) zfs_acl_locator_cb_t locate = { 0 }; uint64_t uid, gid, mode, rdev, xattr, parent, tmp_gen; uint64_t crtime[2], mtime[2], ctime[2], atime[2]; + uint64_t links; zfs_acl_phys_t znode_acl; char scanstamp[AV_SCANSTAMP_SZ]; boolean_t drop_lock = B_FALSE; @@ -351,8 +352,9 @@ zfs_sa_upgrade(sa_handle_t *hdl, dmu_tx_t *tx) &ctime, 16); SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_CRTIME(zsb), NULL, &crtime, 16); + links = ZTOI(zp)->i_nlink; SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_LINKS(zsb), NULL, - &zp->z_links, 8); + &links, 8); if (S_ISBLK(ZTOI(zp)->i_mode) || S_ISCHR(ZTOI(zp)->i_mode)) SA_ADD_BULK_ATTR(sa_attrs, count, SA_ZPL_RDEV(zsb), NULL, &rdev, 8); |