xfs: turn XFS_ATTR3_RMT_BUF_SPACE into a function

Source kernel commit: a5714b67cad586f44777ad834e577037ce6b64fd

Turn this into a properly typechecked function, and actually use the
correct blocksize for extended attributes.  The function cannot be
static inline because xfsprogs userspace uses it.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Andrey Albershteyn <aalbersh@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/db/attr.c b/db/attr.c
index ba722e146e2570eba2527073cec10803edb9b3c0..de68d6276337ea3fac8976defa3eede7eda8226a 100644 (file)
--- a/db/attr.c
+++ b/db/attr.c
@@ -214,7 +214,7 @@ attr3_remote_data_count(
 
        if (hdr->rm_magic != cpu_to_be32(XFS_ATTR3_RMT_MAGIC))
                return 0;
-       buf_space = XFS_ATTR3_RMT_BUF_SPACE(mp, mp->m_sb.sb_blocksize);
+       buf_space = xfs_attr3_rmt_buf_space(mp);
        if (be32_to_cpu(hdr->rm_bytes) > buf_space)
                return buf_space;
        return be32_to_cpu(hdr->rm_bytes);

diff --git a/db/metadump.c b/db/metadump.c
index a656ef574a7e44b29d54b1891e8bf972a4d44919..9457e02e828865eaedeece7bcc9a2255c91fc094 100644 (file)
--- a/db/metadump.c
+++ b/db/metadump.c
@@ -1369,7 +1369,7 @@ add_remote_vals(
                attr_data.remote_vals[attr_data.remote_val_count] = blockidx;
                attr_data.remote_val_count++;
                blockidx++;
-               length -= XFS_ATTR3_RMT_BUF_SPACE(mp, mp->m_sb.sb_blocksize);
+               length -= xfs_attr3_rmt_buf_space(mp);
        }
 
        if (attr_data.remote_val_count >= MAX_REMOTE_VALS) {
@@ -1405,8 +1405,8 @@ process_attr_block(
                            attr_data.remote_vals[i] == offset)
                                /* Macros to handle both attr and attr3 */
                                memset(block +
-                                       (bs - XFS_ATTR3_RMT_BUF_SPACE(mp, bs)),
-                                     'v', XFS_ATTR3_RMT_BUF_SPACE(mp, bs));
+                                       (bs - xfs_attr3_rmt_buf_space(mp)),
+                                     'v', xfs_attr3_rmt_buf_space(mp));
                }
                return;
        }
@@ -1418,7 +1418,7 @@ process_attr_block(
        if (nentries == 0 ||
            nentries * sizeof(xfs_attr_leaf_entry_t) +
                        xfs_attr3_leaf_hdr_size(leaf) >
-                               XFS_ATTR3_RMT_BUF_SPACE(mp, bs)) {
+                               xfs_attr3_rmt_buf_space(mp)) {
                if (metadump.show_warnings)
                        print_warning("invalid attr count in inode %llu",
                                        (long long)metadump.cur_ino);

diff --git a/libxfs/xfs_attr_remote.c b/libxfs/xfs_attr_remote.c
index 34e74fd572a8205e48b30465a44b83452639650e..58078465bf316e75871a9f986b93054b9556b96e 100644 (file)
--- a/libxfs/xfs_attr_remote.c
+++ b/libxfs/xfs_attr_remote.c
@@ -42,6 +42,19 @@
  * the logging system and therefore never have a log item.
  */
 
+/* How many bytes can be stored in a remote value buffer? */
+inline unsigned int
+xfs_attr3_rmt_buf_space(
+       struct xfs_mount        *mp)
+{
+       unsigned int            blocksize = mp->m_attr_geo->blksize;
+
+       if (xfs_has_crc(mp))
+               return blocksize - sizeof(struct xfs_attr3_rmt_hdr);
+
+       return blocksize;
+}
+
 /*
  * Each contiguous block has a header, so it is not just a simple attribute
  * length to FSB conversion.
@@ -52,7 +65,7 @@ xfs_attr3_rmt_blocks(
        unsigned int            attrlen)
 {
        if (xfs_has_crc(mp)) {
-               unsigned int buflen = XFS_ATTR3_RMT_BUF_SPACE(mp, mp->m_sb.sb_blocksize);
+               unsigned int buflen = xfs_attr3_rmt_buf_space(mp);
                return (attrlen + buflen - 1) / buflen;
        }
        return XFS_B_TO_FSB(mp, attrlen);
@@ -292,7 +305,7 @@ xfs_attr_rmtval_copyout(
 
        while (len > 0 && *valuelen > 0) {
                unsigned int hdr_size = 0;
-               unsigned int byte_cnt = XFS_ATTR3_RMT_BUF_SPACE(mp, blksize);
+               unsigned int byte_cnt = xfs_attr3_rmt_buf_space(mp);
 
                byte_cnt = min(*valuelen, byte_cnt);
 
@@ -341,7 +354,7 @@ xfs_attr_rmtval_copyin(
 
        while (len > 0 && *valuelen > 0) {
                unsigned int hdr_size;
-               unsigned int byte_cnt = XFS_ATTR3_RMT_BUF_SPACE(mp, blksize);
+               unsigned int byte_cnt = xfs_attr3_rmt_buf_space(mp);
 
                byte_cnt = min(*valuelen, byte_cnt);
                hdr_size = xfs_attr3_rmt_hdr_set(mp, dst, ino, *offset,

diff --git a/libxfs/xfs_da_format.h b/libxfs/xfs_da_format.h
index ebde6eb1da65d4a7cd500157c377e56025280ed6..86de99e2f757071edccb4ff713fad3981b994ae2 100644 (file)
--- a/libxfs/xfs_da_format.h
+++ b/libxfs/xfs_da_format.h
@@ -880,9 +880,7 @@ struct xfs_attr3_rmt_hdr {
 
 #define XFS_ATTR3_RMT_CRC_OFF  offsetof(struct xfs_attr3_rmt_hdr, rm_crc)
 
-#define XFS_ATTR3_RMT_BUF_SPACE(mp, bufsize)   \
-       ((bufsize) - (xfs_has_crc((mp)) ? \
-                       sizeof(struct xfs_attr3_rmt_hdr) : 0))
+unsigned int xfs_attr3_rmt_buf_space(struct xfs_mount *mp);
 
 /* Number of bytes in a directory block. */
 static inline unsigned int xfs_dir2_dirblock_bytes(struct xfs_sb *sbp)