xfs: use XFS_IFORK_Q to determine the presence of an xattr fork

Modify xfs_ifork_ptr to return a NULL pointer if the caller asks for the
attribute fork but i_forkoff is zero.  This eliminates the ambiguity
between i_forkoff and i_af.if_present, which should make it easier to
understand the lifetime of attr forks.

While we're at it, remove the if_present checks around calls to
xfs_idestroy_fork and xfs_ifork_zap_attr since they can both handle attr
forks that have already been torn down.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>

diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index b661dc7600c82fa0931e367872182e57a0fa2c88..8721d012e9836577b93aaf93df9ddb8aae62781f 100644 (file)
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -69,8 +69,6 @@ xfs_inode_hasattr(
 {
        if (!XFS_IFORK_Q(ip))
                return 0;
-       if (!ip->i_af.if_present)
-               return 0;
        if (ip->i_af.if_format == XFS_DINODE_FMT_EXTENTS &&
            ip->i_af.if_nextents == 0)
                return 0;

diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
index 0f100db504eefca2050f58f3297559aca24b1074..36371c3b9069c4b05013572dfc2999316334a850 100644 (file)
--- a/fs/xfs/libxfs/xfs_attr.h
+++ b/fs/xfs/libxfs/xfs_attr.h
@@ -576,7 +576,7 @@ xfs_attr_init_add_state(struct xfs_da_args *args)
         * context, i_af is guaranteed to exist. Hence if the attr fork is
         * null, we were called from a pure remove operation and so we are done.
         */
-       if (!args->dp->i_af.if_present)
+       if (!XFS_IFORK_Q(args->dp))
                return XFS_DAS_DONE;
 
        args->op_flags |= XFS_DA_OP_ADDNAME;

diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 32dc74a04cc8bab9913de0cee76401dfc3b21dfd..1ef72443025ad744a2e30df5fd852a0c05cf17b2 100644 (file)
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -1041,7 +1041,6 @@ xfs_bmap_add_attrfork(
        error = xfs_bmap_set_attrforkoff(ip, size, &version);
        if (error)
                goto trans_cancel;
-       ASSERT(!ip->i_af.if_present);
 
        xfs_ifork_init_attr(ip, XFS_DINODE_FMT_EXTENTS, 0);
        logflags = 0;

diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
index dd11df5d3bf811f82513f8c57532a2f2881243cf..2f742a1b7c0a3ca4da2bf0a20038c6c2dc34e981 100644 (file)
--- a/fs/xfs/libxfs/xfs_inode_buf.c
+++ b/fs/xfs/libxfs/xfs_inode_buf.c
@@ -177,7 +177,6 @@ xfs_inode_from_disk(
        xfs_failaddr_t          fa;
 
        ASSERT(ip->i_cowfp == NULL);
-       ASSERT(!ip->i_af.if_present);
 
        fa = xfs_dinode_verify(ip->i_mount, ip->i_ino, from);
        if (fa) {

diff --git a/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c
index 9d5141c21eee9118a32fd7f313046c08f1718cb4..b0370b837166a147789d8f94009854fd58ebc27b 100644 (file)
--- a/fs/xfs/libxfs/xfs_inode_fork.c
+++ b/fs/xfs/libxfs/xfs_inode_fork.c
@@ -282,9 +282,6 @@ xfs_ifork_init_attr(
        enum xfs_dinode_fmt     format,
        xfs_extnum_t            nextents)
 {
-       ASSERT(!ip->i_af.if_present);
-
-       ip->i_af.if_present = 1;
        ip->i_af.if_format = format;
        ip->i_af.if_nextents = nextents;
 }
@@ -293,7 +290,6 @@ void
 xfs_ifork_zap_attr(
        struct xfs_inode        *ip)
 {
-       ASSERT(ip->i_af.if_present);
        ASSERT(ip->i_af.if_broot == NULL);
        ASSERT(ip->i_af.if_u1.if_data == NULL);
        ASSERT(ip->i_af.if_height == 0);
@@ -683,7 +679,6 @@ xfs_ifork_init_cow(
 
        ip->i_cowfp = kmem_cache_zalloc(xfs_ifork_cache,
                                       GFP_NOFS | __GFP_NOFAIL);
-       ip->i_cowfp->if_present = 1;
        ip->i_cowfp->if_format = XFS_DINODE_FMT_EXTENTS;
 }
 
@@ -722,7 +717,7 @@ xfs_ifork_verify_local_attr(
        struct xfs_ifork        *ifp = &ip->i_af;
        xfs_failaddr_t          fa;
 
-       if (!ifp->if_present)
+       if (!XFS_IFORK_Q(ip))
                fa = __this_address;
        else
                fa = xfs_attr_shortform_verify(ip);

diff --git a/fs/xfs/libxfs/xfs_inode_fork.h b/fs/xfs/libxfs/xfs_inode_fork.h
index 63015e9cee14182693b3a1315a2cfbb73ded412d..0b912bbe4f4bcf9b2aa7c3829ae9b02f1c2c91f5 100644 (file)
--- a/fs/xfs/libxfs/xfs_inode_fork.h
+++ b/fs/xfs/libxfs/xfs_inode_fork.h
@@ -24,7 +24,6 @@ struct xfs_ifork {
        xfs_extnum_t            if_nextents;    /* # of extents in this fork */
        short                   if_broot_bytes; /* bytes allocated for root */
        int8_t                  if_format;      /* format of this fork */
-       int8_t                  if_present;     /* 1 if present */
 };
 
 /*

diff --git a/fs/xfs/xfs_attr_inactive.c b/fs/xfs/xfs_attr_inactive.c
index dbe715fe92cec2b887d00b62834862d166f0c6b2..ec20ad7a9001512a5cd717068dab752a01b4140d 100644 (file)
--- a/fs/xfs/xfs_attr_inactive.c
+++ b/fs/xfs/xfs_attr_inactive.c
@@ -362,12 +362,11 @@ xfs_attr_inactive(
 
        /*
         * Invalidate and truncate the attribute fork extents. Make sure the
-        * fork actually has attributes as otherwise the invalidation has no
+        * fork actually has xattr blocks as otherwise the invalidation has no
         * blocks to read and returns an error. In this case, just do the fork
         * removal below.
         */
-       if (xfs_inode_hasattr(dp) &&
-           dp->i_af.if_format != XFS_DINODE_FMT_LOCAL) {
+       if (dp->i_af.if_nextents > 0) {
                error = xfs_attr3_root_inactive(&trans, dp);
                if (error)
                        goto out_cancel;
@@ -388,10 +387,8 @@ out_cancel:
        xfs_trans_cancel(trans);
 out_destroy_fork:
        /* kill the in-core attr fork before we drop the inode lock */
-       if (dp->i_af.if_present) {
-               xfs_idestroy_fork(&dp->i_af);
-               xfs_ifork_zap_attr(dp);
-       }
+       xfs_idestroy_fork(&dp->i_af);
+       xfs_ifork_zap_attr(dp);
        if (lock_mode)
                xfs_iunlock(dp, lock_mode);
        return error;

diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c
index 6a832ee079168071ab24b85be1281f41a86af5f9..99bbbe1a0e447877829f87d3d615c562b038bb93 100644 (file)
--- a/fs/xfs/xfs_attr_list.c
+++ b/fs/xfs/xfs_attr_list.c
@@ -61,7 +61,6 @@ xfs_attr_shortform_list(
        int                             sbsize, nsbuf, count, i;
        int                             error = 0;
 
-       ASSERT(dp->i_af.if_present);
        sf = (struct xfs_attr_shortform *)dp->i_af.if_u1.if_data;
        ASSERT(sf != NULL);
        if (!sf->hdr.count)

diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index e08dedfb7f9d021734c03095dd2182075f661c87..026c63234f8d4081ab767c93bce69cd024d62155 100644 (file)
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -102,7 +102,6 @@ xfs_inode_alloc(
        memset(&ip->i_af, 0, sizeof(ip->i_af));
        ip->i_af.if_format = XFS_DINODE_FMT_EXTENTS;
        memset(&ip->i_df, 0, sizeof(ip->i_df));
-       ip->i_df.if_present = 1;
        ip->i_flags = 0;
        ip->i_delayed_blks = 0;
        ip->i_diflags2 = mp->m_ino_geo.new_diflags2;
@@ -132,10 +131,9 @@ xfs_inode_free_callback(
                break;
        }
 
-       if (ip->i_af.if_present) {
-               xfs_idestroy_fork(&ip->i_af);
-               xfs_ifork_zap_attr(ip);
-       }
+       xfs_idestroy_fork(&ip->i_af);
+       xfs_ifork_zap_attr(ip);
+
        if (ip->i_cowfp) {
                xfs_idestroy_fork(ip->i_cowfp);
                kmem_cache_free(xfs_ifork_cache, ip->i_cowfp);

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index f5e553168b42912fc9363bd22c0759fddc2d6ac1..699c44f5770794c99c32d7f029730bd6598048c0 100644 (file)
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -125,7 +125,7 @@ xfs_ilock_attr_map_shared(
 {
        uint                    lock_mode = XFS_ILOCK_SHARED;
 
-       if (ip->i_af.if_present && xfs_need_iread_extents(&ip->i_af))
+       if (XFS_IFORK_Q(ip) && xfs_need_iread_extents(&ip->i_af))
                lock_mode = XFS_ILOCK_EXCL;
        xfs_ilock(ip, lock_mode);
        return lock_mode;
@@ -1768,7 +1768,6 @@ xfs_inactive(
                        goto out;
        }
 
-       ASSERT(!ip->i_af.if_present);
        ASSERT(ip->i_forkoff == 0);
 
        /*
@@ -3502,7 +3501,7 @@ xfs_iflush(
        if (ip->i_df.if_format == XFS_DINODE_FMT_LOCAL &&
            xfs_ifork_verify_local_data(ip))
                goto flush_out;
-       if (ip->i_af.if_present &&
+       if (XFS_IFORK_Q(ip) &&
            ip->i_af.if_format == XFS_DINODE_FMT_LOCAL &&
            xfs_ifork_verify_local_attr(ip))
                goto flush_out;

diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index 045bad62ac2560b8db5a537aaf7b82edd4845f86..9bda01311c2f7637316f7016878e75e74a5e2bda 100644 (file)
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -86,7 +86,7 @@ xfs_ifork_ptr(
        case XFS_DATA_FORK:
                return &ip->i_df;
        case XFS_ATTR_FORK:
-               if (!ip->i_af.if_present)
+               if (!XFS_IFORK_Q(ip))
                        return NULL;
                return &ip->i_af;
        case XFS_COW_FORK: