Skip to contentSkip to conversation

kill XFS_INOBT_IS_FREE_DISK

PATCH In review Christoph Hellwig 4 participants 6 messages Sep 19, 2007 – Sep 29, 2007 XFS filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kill XFS_INOBT_IS_FREE_DISK

This macro is unused an all other acros in this family operate on native types, so we most likely won't grow a user either.

fs/xfs/xfs_ialloc_btree.h +0 -2
Index: linux-2.6.23-rc6/fs/xfs/xfs_ialloc_btree.h
===================================================================
@@ -81,8 +81,6 @@ typedef	struct xfs_btree_sblock xfs_inob
 #define	XFS_INOBT_MASK(i)		((xfs_inofree_t)1 << (i))
 #define	XFS_INOBT_IS_FREE(rp,i)		\
 		(((rp)->ir_free & XFS_INOBT_MASK(i)) != 0)
-#define	XFS_INOBT_IS_FREE_DISK(rp,i)	\
-		((be64_to_cpu((rp)->ir_free) & XFS_INOBT_MASK(i)) != 0)
 #define	XFS_INOBT_SET_FREE(rp,i)	((rp)->ir_free |= XFS_INOBT_MASK(i))
 #define	XFS_INOBT_CLR_FREE(rp,i)	((rp)->ir_free &= ~XFS_INOBT_MASK(i))
 
#1 lore raw
Quoted 2 lines · Christoph Hellwig

This macro is unused an all other acros in this family operate on native types, so we most likely won't grow a user either.

Looks good to me... FWIW, here are the currently-unused macros in xfs cvs, if I'm massaging it right:

_ACL_ACCESS_EXISTS
_ACL_GET_ACCESS
ATTR_DONTFOLLOW
ATTR_TRUST
BMBT_USE_64
CE_CONT
current_clear_flags_nested
FSYNC_INVAL
FSYNC_NOWAIT
HAVE_DM_EVENTTYPE_T
HAVE_DM_RIGHT_T
HAVE_SPLICE
MODEMASK
NDPP
nested_spinlock
nested_spinunlock
SGI_ACL_DEFAULT_SIZE
SV_KEYED
SV_LIFO
SV_PRIO
sv_timedwait
sv_timedwait_sig
sv_wait_sig
TRACE0
TRACE1
TRACE3
VN_ISBLK
VN_ISCHR
VN_ISLNK
VREAD
VSUID
VSVTX
VWRITE
XB_GET_OWNER
XFS_AT_ALL
XFS_AT_SIZE_NOPERM
XFS_AT_TIMES
xfs_buf_ctob
XFS_BUF_ISORDERED
XFS_BUF_ISWRITE
XFS_BUF_OFFSET
XFS_BUF_SET_OFFSET
XFS_BUF_SET_SIZE
XFS_BUF_UNBUSY
XFS_BUF_VSEMA
XFS_DA_MAXHASH
XFS_DFORK_ASIZE_HOST
XFS_DFORK_DSIZE_HOST
XFS_ERRLEVEL_OFF
XFS_ERRTAG_DIOWRITE_IOERR
XFS_ERRTAG_MAX
XFS_ERRTAG_NOERROR
XFS_ERRTAG_STRATCMPL_IOERR
XFS_ERRTAG_STRATREAD_IOERR
XFS_EXTENT_TOKEN_WR
XFS_IO_DCXVN
XFS_IOMAP_WRITE_UNWRITTEN
XFS_IS_PQUOTA_RUNNING
XFS_LID_PINNED
XFS_MAX_LOG_BLOCKS
XFS_MAX_LOG_BYTES
xfs_probe_dmapi
xfs_probe_ioops
xfs_probe_quota
XFS_QMOPT_DOLOG
XFS_RANDOM_DIOWRITE_IOERR
XFS_RANDOM_STRATCMPL_IOERR
XFS_RANDOM_STRATREAD_IOERR
XFS_SBF_NOFLAGS
XFS_SB_VERSION2_REALFBITS
XFS_SB_VERSION2_RESERVED1BIT
XFS_SB_VERSION2_RESERVED4BIT
XFS_SB_VERSION_ADDDALIGN
XFS_SB_VERSION_ADDEXTFLGBIT
XFS_SB_VERSION_ADDSHARED
XFS_SB_VERSION_SUBEXTFLGBIT
XFS_SB_VERSION_SUBSHARED
XFS_SIZE_TOKEN_WR
XFS_SX_VERSION
xlog_exit
XLOG_FMT_IRIX_BE
XLOG_MIN_RECORD_BSHIFT
XLOG_RHASH_BITS
XLOG_SET
XLOG_STATE_NOTUSED

-Eric

#2 lore raw
Quoted 11 lines · Eric Sandeen
Quoted 2 lines · Christoph Hellwig

This macro is unused an all other acros in this family operate on native types, so we most likely won't grow a user either.

Looks good to me... FWIW, here are the currently-unused macros in xfs cvs, if I'm massaging it right:

_ACL_ACCESS_EXISTS
_ACL_GET_ACCESS

SGI_ACL_DEFAULT_SIZE

will go away with conversion to generic posix acl code.

Quoted 2 lines

ATTR_DONTFOLLOW
ATTR_TRUST

might go away with conversion to generic xattr code.

Quoted 1 line

BMBT_USE_64

I have a patch for this one.

Quoted 4 lines

CE_CONT
current_clear_flags_nested
FSYNC_INVAL
FSYNC_NOWAIT

We should probably kill these.

Quoted 2 lines

HAVE_DM_EVENTTYPE_T
HAVE_DM_RIGHT_T

no idea for these.

Quoted 1 line

HAVE_SPLICE

Backward compat?

Quoted 2 lines

MODEMASK
NDPP

kill?

Quoted 2 lines

nested_spinlock
nested_spinunlock

don't your patches kill these?

Quoted 6 lines

SV_KEYED
SV_LIFO
SV_PRIO
sv_timedwait
sv_timedwait_sig
sv_wait_sig

should probably go.

Quoted 3 lines

TRACE0
TRACE1
TRACE3

kill?

Quoted 7 lines

VN_ISBLK
VN_ISCHR
VN_ISLNK
VREAD
VSUID
VSVTX
VWRITE

I have a patch to kill all this gunk.

Quoted 3 lines

XFS_AT_ALL
XFS_AT_SIZE_NOPERM
XFS_AT_TIMES

I have some patches patch to kill XFS_AT_*

Quoted 2 lines

XFS_DFORK_ASIZE_HOST
XFS_DFORK_DSIZE_HOST

I have some patches to rework XFS_{C,D,I}FORK*

Quoted 9 lines

XB_GET_OWNER
xfs_buf_ctob
XFS_BUF_ISORDERED
XFS_BUF_ISWRITE
XFS_BUF_OFFSET
XFS_BUF_SET_OFFSET
XFS_BUF_SET_SIZE
XFS_BUF_UNBUSY
XFS_BUF_VSEMA

not sure what to do with all the buf stuff.

Quoted 2 lines

XFS_IO_DCXVN
XFS_IOMAP_WRITE_UNWRITTEN

should be gone with the patches I sent to the list.

Quoted 3 lines

xfs_probe_dmapi
xfs_probe_ioops
xfs_probe_quota

these are gone in a patch that I sent to the list already.

Quoted 9 lines

XFS_SBF_NOFLAGS
XFS_SB_VERSION2_REALFBITS
XFS_SB_VERSION2_RESERVED1BIT
XFS_SB_VERSION2_RESERVED4BIT
XFS_SB_VERSION_ADDDALIGN
XFS_SB_VERSION_ADDEXTFLGBIT
XFS_SB_VERSION_ADDSHARED
XFS_SB_VERSION_SUBEXTFLGBIT
XFS_SB_VERSION_SUBSHARED

I suspect there are kind expected to be unused.

#3 lore raw
Quoted 5 lines · Christoph Hellwig
Quoted 2 lines

HAVE_SPLICE

Backward compat?

ah, yeah, it's for 2.4:

0 xfs/linux-2.6/xfs_linux.h <global> 104 #define HAVE_SPLICE
1 fs/xfs/xfs_vnodeops.c <global> 4718 #ifdef HAVE_SPLICE

can probably go soon eh. HAVE_PERCPU_SB can too (not sure why it's not in my list) There may be others that are just for 2.4.

Quoted 5 lines
Quoted 3 lines

nested_spinlock
nested_spinunlock

don't your patches kill these?

yeah, I just checked pristine cvs.

-Eric

#4 lore raw
In reply to Christoph Hellwig
Quoted 13 lines · Eric Sandeen
Quoted 11 lines

Christoph Hellwig wrote:
...
XFS_SBF_NOFLAGS
XFS_SB_VERSION2_REALFBITS
XFS_SB_VERSION2_RESERVED1BIT
XFS_SB_VERSION2_RESERVED4BIT
XFS_SB_VERSION_ADDDALIGN
XFS_SB_VERSION_ADDEXTFLGBIT
XFS_SB_VERSION_ADDSHARED
XFS_SB_VERSION_SUBEXTFLGBIT
XFS_SB_VERSION_SUBSHARED

Quoted 2 lines

I suspect there are kind expected to be unused.

They're used in userspace IIRC. (Well, some - probably not the RESERVED ones)

cheers.

--
Nathan

#5 lore raw
In reply to Christoph Hellwig
Quoted 2 lines · Christoph Hellwig

This macro is unused an all other acros in this family operate on native types, so we most likely won't grow a user either.

Could anyone put this trivial remove one line patch in?

Quoted 9 lines

Index: linux-2.6.23-rc6/fs/xfs/xfs_ialloc_btree.h
===================================================================

fs/xfs/xfs_ialloc_btree.h typedef struct xfs_btree_sblock xfs_inob · line 86

Quoted 8 lines
fs/xfs/xfs_ialloc_btree.h +0 -2
@@ -81,8 +81,6 @@ typedef	struct xfs_btree_sblock xfs_inob
 #define	XFS_INOBT_MASK(i)		((xfs_inofree_t)1 << (i))
 #define	XFS_INOBT_IS_FREE(rp,i)		\
 		(((rp)->ir_free & XFS_INOBT_MASK(i)) != 0)
-#define	XFS_INOBT_IS_FREE_DISK(rp,i)	\
-		((be64_to_cpu((rp)->ir_free) & XFS_INOBT_MASK(i)) != 0)
 #define	XFS_INOBT_SET_FREE(rp,i)	((rp)->ir_free |= XFS_INOBT_MASK(i))
 #define	XFS_INOBT_CLR_FREE(rp,i)	((rp)->ir_free &= ~XFS_INOBT_MASK(i))
 

---end quoted text---