Merge tag 'arm-soc/for-5.5/devicetree-part2' of https://github.com/Broadcom/stblinux...

[linux.git] / fs / xfs / xfs_inode_item.c

diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index a3a75db4d15809cf0477f6ad6be6ff2a682a38b7..8bd5d0de6321e8fa4d790a0febcf11852e4d9c33 100644 (file)
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -310,8 +310,8 @@ xfs_inode_to_log_dinode(
        to->di_format = from->di_format;
        to->di_uid = from->di_uid;
        to->di_gid = from->di_gid;
-       to->di_projid_lo = from->di_projid_lo;
-       to->di_projid_hi = from->di_projid_hi;
+       to->di_projid_lo = from->di_projid & 0xffff;
+       to->di_projid_hi = from->di_projid >> 16;
 
        memset(to->di_pad, 0, sizeof(to->di_pad));
        memset(to->di_pad3, 0, sizeof(to->di_pad3));
@@ -667,7 +667,7 @@ xfs_inode_item_destroy(
        xfs_inode_t     *ip)
 {
        kmem_free(ip->i_itemp->ili_item.li_lv_shadow);
-       kmem_zone_free(xfs_ili_zone, ip->i_itemp);
+       kmem_cache_free(xfs_ili_zone, ip->i_itemp);
 }