xfs: call xfs_iformat_fork from xfs_inode_from_disk
We always need to fill out the fork structures when reading the inode, so call xfs_iformat_fork from the tail of xfs_inode_from_disk. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:

committed by
Darrick J. Wong

parent
b90c2a9c8b
commit
cb7d585944
@@ -180,7 +180,7 @@ xfs_imap_to_bp(
|
||||
return 0;
|
||||
}
|
||||
|
||||
void
|
||||
int
|
||||
xfs_inode_from_disk(
|
||||
struct xfs_inode *ip,
|
||||
struct xfs_dinode *from)
|
||||
@@ -241,6 +241,8 @@ xfs_inode_from_disk(
|
||||
to->di_flags2 = be64_to_cpu(from->di_flags2);
|
||||
to->di_cowextsize = be32_to_cpu(from->di_cowextsize);
|
||||
}
|
||||
|
||||
return xfs_iformat_fork(ip, from);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -641,8 +643,7 @@ xfs_iread(
|
||||
* Otherwise, just get the truly permanent information.
|
||||
*/
|
||||
if (dip->di_mode) {
|
||||
xfs_inode_from_disk(ip, dip);
|
||||
error = xfs_iformat_fork(ip, dip);
|
||||
error = xfs_inode_from_disk(ip, dip);
|
||||
if (error) {
|
||||
#ifdef DEBUG
|
||||
xfs_alert(mp, "%s: xfs_iformat() returned error %d",
|
||||
|
Reference in New Issue
Block a user