xfs
[Top] [All Lists]

[PATCH] Fix wrong flag ASSERT in xfs_attr_shortform_getvalue

To: xfs-oss <xfs@xxxxxxxxxxx>
Subject: [PATCH] Fix wrong flag ASSERT in xfs_attr_shortform_getvalue
From: Eric Sandeen <sandeen@xxxxxxxxxx>
Date: Fri, 30 Mar 2012 11:24:11 -0500
User-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:11.0) Gecko/20120327 Thunderbird/11.0.1
This ASSERT is testing an if_flags flag value against
a di_aformat enum value.  di_aformat is never assigned
XFS_IFINLINE.

This happens to work for now, because XFS_IFINLINE has
the same value as XFS_DINODE_FMT_LOCAL, and that's tested
just before we call this function.

However, I think the intention is to assert that we have
read in the data, i.e. XFS_IFINLINE on if_flags, before
we use if_data.  This is done in other places through the
code as well.

Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
---

Note, maybe it should be:

        ASSERT(args->dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL);

but there is an if statement in the caller which assures that,
so as the code stands that would seem pointless.  I'm not 100%
sure what the original intent was, though, so ...

diff --git a/fs/xfs/xfs_attr_leaf.c b/fs/xfs/xfs_attr_leaf.c
index 76d93dc..8ca76ad 100644
--- a/fs/xfs/xfs_attr_leaf.c
+++ b/fs/xfs/xfs_attr_leaf.c
@@ -441,7 +441,7 @@ xfs_attr_shortform_getvalue(xfs_da_args_t *args)
        xfs_attr_sf_entry_t *sfe;
        int i;
 
-       ASSERT(args->dp->i_d.di_aformat == XFS_IFINLINE);
+       ASSERT(args->dp->i_afp->if_flags == XFS_IFINLINE);
        sf = (xfs_attr_shortform_t *)args->dp->i_afp->if_u1.if_data;
        sfe = &sf->list[0];
        for (i = 0; i < sf->hdr.count;

<Prev in Thread] Current Thread [Next in Thread>