|
@@ -251,7 +251,7 @@ xfs_attr_rmtval_copyout(
|
|
|
int hdr_size = 0;
|
|
|
int byte_cnt = XFS_ATTR3_RMT_BUF_SPACE(mp, XFS_LBSIZE(mp));
|
|
|
|
|
|
- byte_cnt = min_t(int, *valuelen, byte_cnt);
|
|
|
+ byte_cnt = min(*valuelen, byte_cnt);
|
|
|
|
|
|
if (xfs_sb_version_hascrc(&mp->m_sb)) {
|
|
|
if (!xfs_attr3_rmt_hdr_ok(mp, src, ino, *offset,
|
|
@@ -545,11 +545,6 @@ xfs_attr_rmtval_remove(
|
|
|
|
|
|
/*
|
|
|
* Roll through the "value", invalidating the attribute value's blocks.
|
|
|
- * Note that args->rmtblkcnt is the minimum number of data blocks we'll
|
|
|
- * see for a CRC enabled remote attribute. Each extent will have a
|
|
|
- * header, and so we may have more blocks than we realise here. If we
|
|
|
- * fail to map the blocks correctly, we'll have problems with the buffer
|
|
|
- * lookups.
|
|
|
*/
|
|
|
lblkno = args->rmtblkno;
|
|
|
blkcnt = args->rmtblkcnt;
|
|
@@ -630,4 +625,3 @@ xfs_attr_rmtval_remove(
|
|
|
}
|
|
|
return(0);
|
|
|
}
|
|
|
-
|