summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_inode.c
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2016-02-09 06:54:58 +0100
committerDave Chinner <david@fromorbit.com>2016-02-09 06:54:58 +0100
commitfaeb4e4715be017e88e630bda84477afc1dff38b (patch)
treece03ca459a3bbefd7be3ee31b295e3948935c20c /fs/xfs/xfs_inode.c
parentxfs: cull unnecessary icdinode fields (diff)
downloadlinux-faeb4e4715be017e88e630bda84477afc1dff38b.tar.xz
linux-faeb4e4715be017e88e630bda84477afc1dff38b.zip
xfs: move v1 inode conversion to xfs_inode_from_disk
So we don't have to carry an di_onlink variable around anymore, move the inode conversion from v1 inode format to v2 inode format into xfs_inode_from_disk(). This means we can remove the di_onlink fields from the struct xfs_icdinode. Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs/xfs_inode.c')
-rw-r--r--fs/xfs/xfs_inode.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 45acdee98983..7d9c514fd231 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -803,9 +803,7 @@ xfs_ialloc(
ip->i_d.di_version = 2;
ip->i_d.di_mode = mode;
- ip->i_d.di_onlink = 0;
ip->i_d.di_nlink = nlink;
- ASSERT(ip->i_d.di_nlink == nlink);
ip->i_d.di_uid = xfs_kuid_to_uid(current_fsuid());
ip->i_d.di_gid = xfs_kgid_to_gid(current_fsgid());
xfs_set_projid(ip, prid);