libxfs: drop the ifork_ops parameter from libxfs_inode_verify_forks

Now that the inode remembers its own ifork_ops, we can drop the second
parameter from libxfs_inode_verify_forks.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Bill O'Donnell <billodo@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/include/xfs_inode.h b/include/xfs_inode.h
index e1e8b43085144c000464fb98476469158282ceb7..52d79f3c42678b5e9de4971ba437df1af8958edf 100644 (file)
--- a/include/xfs_inode.h
+++ b/include/xfs_inode.h
@@ -151,8 +151,7 @@ extern void libxfs_trans_ichgtime(struct xfs_trans *,
 extern int     libxfs_iflush_int (struct xfs_inode *, struct xfs_buf *);
 
 /* Inode Cache Interfaces */
-extern bool    libxfs_inode_verify_forks(struct xfs_inode *ip,
-                               struct xfs_ifork_ops *);
+extern bool    libxfs_inode_verify_forks(struct xfs_inode *ip);
 extern int     libxfs_iget(struct xfs_mount *, struct xfs_trans *, xfs_ino_t,
                                uint, struct xfs_inode **,
                                struct xfs_ifork_ops *);

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 69d5abb2cbca3b3881a7a8af0b2ea8c7e08c5934..bc2ed38c1eb411cc6b84af0171a621c91b4ab3f7 100644 (file)
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -1338,16 +1338,15 @@ extern kmem_zone_t      *xfs_ili_zone;
  */
 bool
 libxfs_inode_verify_forks(
-       struct xfs_inode        *ip,
-       struct xfs_ifork_ops    *ops)
+       struct xfs_inode        *ip)
 {
        struct xfs_ifork        *ifp;
        xfs_failaddr_t          fa;
 
-       if (!ops)
+       if (!ip->i_fork_ops)
                return true;
 
-       fa = xfs_ifork_verify_data(ip, ops);
+       fa = xfs_ifork_verify_data(ip, ip->i_fork_ops);
        if (fa) {
                ifp = XFS_IFORK_PTR(ip, XFS_DATA_FORK);
                xfs_inode_verifier_error(ip, -EFSCORRUPTED, "data fork",
@@ -1355,7 +1354,7 @@ libxfs_inode_verify_forks(
                return false;
        }
 
-       fa = xfs_ifork_verify_attr(ip, ops);
+       fa = xfs_ifork_verify_attr(ip, ip->i_fork_ops);
        if (fa) {
                ifp = XFS_IFORK_PTR(ip, XFS_ATTR_FORK);
                xfs_inode_verifier_error(ip, -EFSCORRUPTED, "attr fork",
@@ -1392,7 +1391,7 @@ libxfs_iget(
        }
 
        ip->i_fork_ops = ifork_ops;
-       if (!libxfs_inode_verify_forks(ip, ifork_ops)) {
+       if (!libxfs_inode_verify_forks(ip)) {
                libxfs_irele(ip);
                return -EFSCORRUPTED;
        }

diff --git a/libxfs/util.c b/libxfs/util.c
index 2e3b9d511211519468ff45123be0eb39bbcaff92..ea75fa206c109dc5801df55f5c59e46ceb7a527b 100644 (file)
--- a/libxfs/util.c
+++ b/libxfs/util.c
@@ -422,7 +422,7 @@ libxfs_iflush_int(xfs_inode_t *ip, xfs_buf_t *bp)
                VFS_I(ip)->i_version++;
 
        /* Check the inline fork data before we write out. */
-       if (!libxfs_inode_verify_forks(ip, ip->i_fork_ops))
+       if (!libxfs_inode_verify_forks(ip))
                return -EFSCORRUPTED;
 
        /*