xfs: patches for 3.13
PATCH v2 12/19 xfs: vectorise remaining shortform dir2 ops
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Following from the initial patch to introduce the directory operations vector, convert the rest of the shortform directory operations to use vectored ops rather than superblock feature checks. This further reduces the size of the built binary:
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2
--- fs/xfs/xfs_da_format.c | 152 ++++++++++++++++++++++++++++++++++++++++++++++ fs/xfs/xfs_da_format.h | 47 -------------- fs/xfs/xfs_dir2.h | 20 +++--- fs/xfs/xfs_dir2_block.c | 6 +- fs/xfs/xfs_dir2_readdir.c | 6 +- fs/xfs/xfs_dir2_sf.c | 151 +++++++++------------------------------------ 6 files changed, 199 insertions(+), 183 deletions(-)
fs/xfs/xfs_da_format.c +152 -0
@@ -69,17 +69,169 @@ xfs_dir3_sf_nextentry( } +/* +* For filetype enabled shortform directories, the file type field is stored at +* the end of the name. Because it's only a single byte, endian conversion is +* not necessary. For non-filetype enable directories, the type is always +* unknown and we never store the value. +*/ +static __uint8_t +xfs_dir2_sfe_get_ftype ( +struct xfs_dir2_sf_entry *sfep) +{ +return XFS_DIR3_FT_UNKNOWN ; +} + +static void +xfs_dir2_sfe_put_ftype ( +struct xfs_dir2_sf_entry *sfep, +__uint8_t ftype) +{ +ASSERT (ftype <XFS_DIR3_FT_MAX ); +} + +static __uint8_t +xfs_dir3_sfe_get_ftype ( +struct xfs_dir2_sf_entry *sfep) +{ +__uint8_t ftype; + + ftype = sfep->name[sfep->namelen]; +if (ftype >=XFS_DIR3_FT_MAX ) +return XFS_DIR3_FT_UNKNOWN ; +return ftype; +} + +static void +xfs_dir3_sfe_put_ftype ( +struct xfs_dir2_sf_entry *sfep, +__uint8_t ftype) +{ +ASSERT (ftype <XFS_DIR3_FT_MAX ); + + sfep->name[sfep->namelen] = ftype; +} + +/* +* Inode numbers in short-form directories can come in two versions, +* either 4 bytes or 8 bytes wide. These helpers deal with the +* two forms transparently by looking at the headers i8count field. +* +* For 64-bit inode number the most significant byte must be zero. +*/ +static xfs_ino_t +xfs_dir2_sf_get_ino ( +struct xfs_dir2_sf_hdr *hdr, +xfs_dir2_inou_t *from) +{ +if (hdr->i8count) +return get_unaligned_be64 (&from->i8.i) &0x00ffffffffffffffULL ; +else +return get_unaligned_be32 (&from->i4.i); +} + +static void +xfs_dir2_sf_put_ino ( +struct xfs_dir2_sf_hdr *hdr, +xfs_dir2_inou_t *to, +xfs_ino_t ino) +{ +ASSERT ((ino &0xff00000000000000ULL ) ==0 ); + +if (hdr->i8count) +put_unaligned_be64 (ino, &to->i8.i); +else +put_unaligned_be32 (ino, &to->i4.i); +} + +static xfs_ino_t +xfs_dir2_sf_get_parent_ino ( +struct xfs_dir2_sf_hdr *hdr) +{ +return xfs_dir2_sf_get_ino (hdr, &hdr->parent); +} + +static void +xfs_dir2_sf_put_parent_ino ( +struct xfs_dir2_sf_hdr *hdr, +xfs_ino_t ino) +{ +xfs_dir2_sf_put_ino (hdr, &hdr->parent, ino); +} + +/* +* In short-form directory entries the inode numbers are stored at variable +* offset behind the entry name. If the entry stores a filetype value, then it +* sits between the name and the inode number. Hence the inode numbers may only +* be accessed through the helpers below. +*/ +static xfs_ino_t +xfs_dir2_sfe_get_ino ( +struct xfs_dir2_sf_hdr *hdr, +struct xfs_dir2_sf_entry *sfep) +{ +return xfs_dir2_sf_get_ino (hdr, + (xfs_dir2_inou_t *)&sfep->name[sfep->namelen]); +} + +static void +xfs_dir2_sfe_put_ino ( +struct xfs_dir2_sf_hdr *hdr, +struct xfs_dir2_sf_entry *sfep, +xfs_ino_t ino) +{ +xfs_dir2_sf_put_ino (hdr, + (xfs_dir2_inou_t *)&sfep->name[sfep->namelen], ino); +} + +static xfs_ino_t +xfs_dir3_sfe_get_ino ( +struct xfs_dir2_sf_hdr *hdr, +struct xfs_dir2_sf_entry *sfep) +{ +return xfs_dir2_sf_get_ino (hdr, + (xfs_dir2_inou_t *)&sfep->name[sfep->namelen +1 ]); +} + +static void +xfs_dir3_sfe_put_ino ( +struct xfs_dir2_sf_hdr *hdr, +struct xfs_dir2_sf_entry *sfep, +xfs_ino_t ino) +{ +xfs_dir2_sf_put_ino (hdr, + (xfs_dir2_inou_t *)&sfep->name[sfep->namelen +1 ], ino); +} +const struct xfs_dir_ops xfs_dir2_ops = { .sf_entsize = xfs_dir2_sf_entsize, .sf_nextentry = xfs_dir2_sf_nextentry, + .sf_get_ftype = xfs_dir2_sfe_get_ftype, + .sf_put_ftype = xfs_dir2_sfe_put_ftype, + .sf_get_ino = xfs_dir2_sfe_get_ino, + .sf_put_ino = xfs_dir2_sfe_put_ino, + .sf_get_parent_ino = xfs_dir2_sf_get_parent_ino, + .sf_put_parent_ino = xfs_dir2_sf_put_parent_ino, };const struct xfs_dir_ops xfs_dir2_ftype_ops = { .sf_entsize = xfs_dir3_sf_entsize, .sf_nextentry = xfs_dir3_sf_nextentry, + .sf_get_ftype = xfs_dir3_sfe_get_ftype, + .sf_put_ftype = xfs_dir3_sfe_put_ftype, + .sf_get_ino = xfs_dir3_sfe_get_ino, + .sf_put_ino = xfs_dir3_sfe_put_ino, + .sf_get_parent_ino = xfs_dir2_sf_get_parent_ino, + .sf_put_parent_ino = xfs_dir2_sf_put_parent_ino, };const struct xfs_dir_ops xfs_dir3_ops = { .sf_entsize = xfs_dir3_sf_entsize, .sf_nextentry = xfs_dir3_sf_nextentry, + .sf_get_ftype = xfs_dir3_sfe_get_ftype, + .sf_put_ftype = xfs_dir3_sfe_put_ftype, + .sf_get_ino = xfs_dir3_sfe_get_ino, + .sf_put_ino = xfs_dir3_sfe_put_ino, + .sf_get_parent_ino = xfs_dir2_sf_get_parent_ino, + .sf_put_parent_ino = xfs_dir2_sf_put_parent_ino, };
fs/xfs/xfs_da_format.h +0 -47
53 lines not on this page · raw message
fs/xfs/xfs_dir2.h +11 -9
@@ -39,6 +39,17 @@ struct xfs_dir_ops {struct xfs_dir2_sf_entry * (*sf_nextentry)(struct xfs_dir2_sf_hdr *hdr,struct xfs_dir2_sf_entry *sfep); +__uint8_t (*sf_get_ftype)(struct xfs_dir2_sf_entry *sfep); +void (*sf_put_ftype)(struct xfs_dir2_sf_entry *sfep, +__uint8_t ftype); +xfs_ino_t (*sf_get_ino)(struct xfs_dir2_sf_hdr *hdr, +struct xfs_dir2_sf_entry *sfep); +void (*sf_put_ino)(struct xfs_dir2_sf_hdr *hdr, +struct xfs_dir2_sf_entry *sfep, +xfs_ino_t ino); +xfs_ino_t (*sf_get_parent_ino)(struct xfs_dir2_sf_hdr *hdr); +void (*sf_put_parent_ino)(struct xfs_dir2_sf_hdr *hdr, +xfs_ino_t ino); };extern const struct xfs_dir_ops xfs_dir2_ops;
@@ -79,15 +90,6 @@ extern int xfs_dir2_sf_to_block(struct xfs_da_args *args);/* * Interface routines used by userspace utilities */ -extern xfs_ino_t xfs_dir2_sf_get_parent_ino (struct xfs_dir2_sf_hdr *sfp); -extern void xfs_dir2_sf_put_parent_ino (struct xfs_dir2_sf_hdr *sfp, -xfs_ino_t ino); -extern xfs_ino_t xfs_dir3_sfe_get_ino (struct xfs_mount *mp, -struct xfs_dir2_sf_hdr *sfp,struct xfs_dir2_sf_entry *sfep); -extern void xfs_dir3_sfe_put_ino (struct xfs_mount *mp, -struct xfs_dir2_sf_hdr *hdr,struct xfs_dir2_sf_entry *sfep, -xfs_ino_t ino); -extern int xfs_dir2_isblock (struct xfs_trans *tp,struct xfs_inode *dp,int *r);extern int xfs_dir2_isleaf (struct xfs_trans *tp,struct xfs_inode *dp,int *r); extern int xfs_dir2_shrink_inode(struct xfs_da_args *args, xfs_dir2_db_t db,
fs/xfs/xfs_dir2_block.c +3 -3
@@ -1173,7 +1173,7 @@ xfs_dir2_sf_to_block(* Create entry for .. */ dep =xfs_dir3_data_dotdot_entry_p (mp, hdr); - dep->inumber =cpu_to_be64 (xfs_dir2_sf_get_parent_ino (sfp)); + dep->inumber =cpu_to_be64 (dp->d_ops->sf_get_parent_ino (sfp)); dep->namelen =2 ; dep->name[0 ] = dep->name[1 ] ='.' ;xfs_dir3_dirent_put_ftype (mp, dep,XFS_DIR3_FT_DIR );
@@ -1222,10 +1222,10 @@ xfs_dir2_sf_to_block(* Copy a real entry. */ dep = (xfs_dir2_data_entry_t *)((char *)hdr + newoffset); - dep->inumber =cpu_to_be64 (xfs_dir3_sfe_get_ino (mp, sfp, sfep)); + dep->inumber =cpu_to_be64 (dp->d_ops->sf_get_ino (sfp, sfep)); dep->namelen = sfep->namelen;xfs_dir3_dirent_put_ftype (mp, dep, -xfs_dir3_sfe_get_ftype (mp, sfp, sfep)); + dp->d_ops->sf_get_ftype (sfep));memcpy (dep->name, sfep->name, dep->namelen); tagp =xfs_dir3_data_entry_tag_p (mp, dep); *tagp =cpu_to_be16 ((char *)dep - (char *)hdr);
fs/xfs/xfs_dir2_readdir.c +3 -3
@@ -136,7 +136,7 @@ xfs_dir2_sf_getdents(* Put .. entry unless we're starting past it. */ if (ctx->pos <= dotdot_offset) { - ino =xfs_dir2_sf_get_parent_ino (sfp); + ino = dp->d_ops->sf_get_parent_ino (sfp); ctx->pos = dotdot_offset &0x7fffffff ;if (!dir_emit (ctx,".." ,2 , ino,DT_DIR ))return 0 ;
@@ -157,8 +157,8 @@ xfs_dir2_sf_getdents(continue ; } - ino =xfs_dir3_sfe_get_ino (mp, sfp, sfep); - filetype =xfs_dir3_sfe_get_ftype (mp, sfp, sfep); + ino = dp->d_ops->sf_get_ino (sfp, sfep); + filetype = dp->d_ops->sf_get_ftype (sfep); ctx->pos = off &0x7fffffff ;if (!dir_emit (ctx, (char *)sfep->name, sfep->namelen, ino,xfs_dir3_get_dtype (mp, filetype)))
fs/xfs/xfs_dir2_sf.c +30 -121
267 lines not on this page · raw message
Signature · 6 lines
1.8.4.rc3 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
PATCH v2 13/19 xfs: vectorise directory data operations
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Following from the initial patches to vectorise the shortform directory encode/decode operations, convert half the data block operations to use the vector. The rest will be done in a second patch.
This further reduces the size of the built binary:
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3
--- fs/xfs/xfs_da_format.c | 218 +++++++++++++++++++++++++++++++++++++++++++++- fs/xfs/xfs_da_format.h | 123 -------------------------- fs/xfs/xfs_dir2.h | 22 ++++- fs/xfs/xfs_dir2_block.c | 54 ++++++------ fs/xfs/xfs_dir2_data.c | 38 +++++--- fs/xfs/xfs_dir2_leaf.c | 22 ++--- fs/xfs/xfs_dir2_node.c | 23 ++--- fs/xfs/xfs_dir2_readdir.c | 14 +-- fs/xfs/xfs_dir2_sf.c | 20 ++--- 9 files changed, 329 insertions(+), 205 deletions(-)
fs/xfs/xfs_da_format.c +217 -1
@@ -28,7 +28,9 @@#include "xfs_inode.h" #include "xfs_dir2.h" - +/* +* Shortform directory ops +*/ static int xfs_dir2_sf_entsize( struct xfs_dir2_sf_hdr *hdr,
@@ -203,6 +205,184 @@ xfs_dir3_sfe_put_ino( (xfs_dir2_inou_t *)&sfep->name[sfep->namelen + 1], ino); } + +/* +* Directory data block operations +*/ +static int +__xfs_dir3_data_entsize ( +bool ftype, +int n) +{ + int size = offsetof(struct xfs_dir2_data_entry, name[0]); + + size += n; + size +=sizeof (xfs_dir2_data_off_t); +if (ftype) + size +=sizeof (__uint8_t); +return roundup (size,XFS_DIR2_DATA_ALIGN ); +} + +static int +xfs_dir2_data_entsize ( +int n) +{ +return __xfs_dir3_data_entsize (false, n); +} +static int +xfs_dir3_data_entsize ( +int n) +{ +return __xfs_dir3_data_entsize (true, n); +} + +static __uint8_t +xfs_dir2_data_get_ftype ( +struct xfs_dir2_data_entry *dep) +{ +return XFS_DIR3_FT_UNKNOWN ; +} + +static void +xfs_dir2_data_put_ftype ( +struct xfs_dir2_data_entry *dep, +__uint8_t ftype) +{ +ASSERT (ftype <XFS_DIR3_FT_MAX ); +} + +static __uint8_t +xfs_dir3_data_get_ftype ( +struct xfs_dir2_data_entry *dep) +{ +__uint8_t ftype = dep->name[dep->namelen]; + +ASSERT (ftype <XFS_DIR3_FT_MAX ); +if (ftype >=XFS_DIR3_FT_MAX ) +return XFS_DIR3_FT_UNKNOWN ; +return ftype; +} + +static void +xfs_dir3_data_put_ftype ( +struct xfs_dir2_data_entry *dep, +__uint8_t type) +{ +ASSERT (type <XFS_DIR3_FT_MAX ); +ASSERT (dep->namelen !=0 ); + + dep->name[dep->namelen] = type; +} + +/* +* Pointer to an entry's tag word. +*/ +static __be16 * +xfs_dir2_data_entry_tag_p ( +struct xfs_dir2_data_entry *dep) +{ +return (__be16 *)((char *)dep + +xfs_dir2_data_entsize (dep->namelen) -sizeof (__be16)); +} + +static __be16 * +xfs_dir3_data_entry_tag_p ( +struct xfs_dir2_data_entry *dep) +{ +return (__be16 *)((char *)dep + +xfs_dir3_data_entsize (dep->namelen) -sizeof (__be16)); +} + +/* +* Offsets of . and .. in data space (always block 0) +*/ +static xfs_dir2_data_aoff_t +xfs_dir2_data_dot_offset (void ) +{ +return sizeof (struct xfs_dir2_data_hdr ); +} + +static xfs_dir2_data_aoff_t +xfs_dir2_data_dotdot_offset (void ) +{ +return xfs_dir2_data_dot_offset () +xfs_dir2_data_entsize (1 ); +} + +static xfs_dir2_data_aoff_t +xfs_dir2_data_first_offset (void ) +{ +return xfs_dir2_data_dotdot_offset () +xfs_dir2_data_entsize (2 ); +} + +static xfs_dir2_data_aoff_t +xfs_dir3_data_dot_offset (void ) +{ +return sizeof (struct xfs_dir3_data_hdr ); +} + +static xfs_dir2_data_aoff_t +xfs_dir3_data_dotdot_offset (void ) +{ +return xfs_dir3_data_dot_offset () +xfs_dir3_data_entsize (1 ); +} + +static xfs_dir2_data_aoff_t +xfs_dir3_data_first_offset (void ) +{ +return xfs_dir3_data_dotdot_offset () +xfs_dir3_data_entsize (2 ); +} + +/* +* location of . and .. in data space (always block 0) +*/ +static struct xfs_dir2_data_entry * +xfs_dir2_data_dot_entry_p ( +struct xfs_dir2_data_hdr *hdr) +{ +return (struct xfs_dir2_data_entry *) + ((char *)hdr +xfs_dir2_data_dot_offset ()); +} + +static struct xfs_dir2_data_entry * +xfs_dir2_data_dotdot_entry_p ( +struct xfs_dir2_data_hdr *hdr) +{ +return (struct xfs_dir2_data_entry *) + ((char *)hdr +xfs_dir2_data_dotdot_offset ()); +} + +static struct xfs_dir2_data_entry * +xfs_dir2_data_first_entry_p ( +struct xfs_dir2_data_hdr *hdr) +{ +return (struct xfs_dir2_data_entry *) + ((char *)hdr +xfs_dir2_data_first_offset ()); +} + +static struct xfs_dir2_data_entry * +xfs_dir3_data_dot_entry_p ( +struct xfs_dir2_data_hdr *hdr) +{ +return (struct xfs_dir2_data_entry *) + ((char *)hdr +xfs_dir3_data_dot_offset ()); +} + +static struct xfs_dir2_data_entry * +xfs_dir3_data_dotdot_entry_p ( +struct xfs_dir2_data_hdr *hdr) +{ +return (struct xfs_dir2_data_entry *) + ((char *)hdr +xfs_dir3_data_dotdot_offset ()); +} + +static struct xfs_dir2_data_entry * +xfs_dir3_data_first_entry_p ( +struct xfs_dir2_data_hdr *hdr) +{ +return (struct xfs_dir2_data_entry *) + ((char *)hdr +xfs_dir3_data_first_offset ()); +} +const struct xfs_dir_ops xfs_dir2_ops = { .sf_entsize = xfs_dir2_sf_entsize, .sf_nextentry = xfs_dir2_sf_nextentry,
@@ -212,6 +392,18 @@ const struct xfs_dir_ops xfs_dir2_ops = { .sf_put_ino = xfs_dir2_sfe_put_ino, .sf_get_parent_ino = xfs_dir2_sf_get_parent_ino, .sf_put_parent_ino = xfs_dir2_sf_put_parent_ino, + + .data_entsize = xfs_dir2_data_entsize, + .data_get_ftype = xfs_dir2_data_get_ftype, + .data_put_ftype = xfs_dir2_data_put_ftype, + .data_entry_tag_p = xfs_dir2_data_entry_tag_p, + + .data_dot_offset = xfs_dir2_data_dot_offset, + .data_dotdot_offset = xfs_dir2_data_dotdot_offset, + .data_first_offset = xfs_dir2_data_first_offset, + .data_dot_entry_p = xfs_dir2_data_dot_entry_p, + .data_dotdot_entry_p = xfs_dir2_data_dotdot_entry_p, + .data_first_entry_p = xfs_dir2_data_first_entry_p, };const struct xfs_dir_ops xfs_dir2_ftype_ops = {
@@ -223,6 +415,18 @@ const struct xfs_dir_ops xfs_dir2_ftype_ops = { .sf_put_ino = xfs_dir3_sfe_put_ino, .sf_get_parent_ino = xfs_dir2_sf_get_parent_ino, .sf_put_parent_ino = xfs_dir2_sf_put_parent_ino, + + .data_entsize = xfs_dir3_data_entsize, + .data_get_ftype = xfs_dir3_data_get_ftype, + .data_put_ftype = xfs_dir3_data_put_ftype, + .data_entry_tag_p = xfs_dir3_data_entry_tag_p, + + .data_dot_offset = xfs_dir2_data_dot_offset, + .data_dotdot_offset = xfs_dir2_data_dotdot_offset, + .data_first_offset = xfs_dir2_data_first_offset, + .data_dot_entry_p = xfs_dir2_data_dot_entry_p, + .data_dotdot_entry_p = xfs_dir2_data_dotdot_entry_p, + .data_first_entry_p = xfs_dir2_data_first_entry_p, };const struct xfs_dir_ops xfs_dir3_ops = {
@@ -234,4 +438,16 @@ const struct xfs_dir_ops xfs_dir3_ops = { .sf_put_ino = xfs_dir3_sfe_put_ino, .sf_get_parent_ino = xfs_dir2_sf_get_parent_ino, .sf_put_parent_ino = xfs_dir2_sf_put_parent_ino, + + .data_entsize = xfs_dir3_data_entsize, + .data_get_ftype = xfs_dir3_data_get_ftype, + .data_put_ftype = xfs_dir3_data_put_ftype, + .data_entry_tag_p = xfs_dir3_data_entry_tag_p, + + .data_dot_offset = xfs_dir3_data_dot_offset, + .data_dotdot_offset = xfs_dir3_data_dotdot_offset, + .data_first_offset = xfs_dir3_data_first_offset, + .data_dot_entry_p = xfs_dir3_data_dot_entry_p, + .data_dotdot_entry_p = xfs_dir3_data_dotdot_entry_p, + .data_first_entry_p = xfs_dir3_data_first_entry_p, };
fs/xfs/xfs_da_format.h +0 -123
135 lines not on this page · raw message
fs/xfs/xfs_dir2.h +19 -3
@@ -50,6 +50,22 @@ struct xfs_dir_ops {xfs_ino_t (*sf_get_parent_ino)(struct xfs_dir2_sf_hdr *hdr);void (*sf_put_parent_ino)(struct xfs_dir2_sf_hdr *hdr,xfs_ino_t ino); + +int (*data_entsize)(int len); +__uint8_t (*data_get_ftype)(struct xfs_dir2_data_entry *dep); +void (*data_put_ftype)(struct xfs_dir2_data_entry *dep, +__uint8_t ftype); +__be16 * (*data_entry_tag_p)(struct xfs_dir2_data_entry *dep); + +xfs_dir2_data_aoff_t (*data_dot_offset)(void); +xfs_dir2_data_aoff_t (*data_dotdot_offset)(void); +xfs_dir2_data_aoff_t (*data_first_offset)(void); +struct xfs_dir2_data_entry * + (*data_dot_entry_p)(struct xfs_dir2_data_hdr *hdr); +struct xfs_dir2_data_entry * + (*data_dotdot_entry_p)(struct xfs_dir2_data_hdr *hdr); +struct xfs_dir2_data_entry * + (*data_first_entry_p)(struct xfs_dir2_data_hdr *hdr); };extern const struct xfs_dir_ops xfs_dir2_ops;
@@ -95,10 +111,10 @@ extern int xfs_dir2_isleaf(struct xfs_trans *tp, struct xfs_inode *dp, int *r);extern int xfs_dir2_shrink_inode (struct xfs_da_args *args,xfs_dir2_db_t db,struct xfs_buf *bp); -extern void xfs_dir2_data_freescan (struct xfs_mount *mp, +extern void xfs_dir2_data_freescan (struct xfs_inode *dp,struct xfs_dir2_data_hdr *hdr,int *loghead); -extern void xfs_dir2_data_log_entry (struct xfs_trans *tp,struct xfs_buf *bp, -struct xfs_dir2_data_entry *dep); +extern void xfs_dir2_data_log_entry (struct xfs_trans *tp,struct xfs_inode *dp, +struct xfs_buf *bp,struct xfs_dir2_data_entry *dep);extern void xfs_dir2_data_log_header (struct xfs_trans *tp,struct xfs_buf *bp); extern void xfs_dir2_data_log_unused(struct xfs_trans *tp, struct xfs_buf *bp,
fs/xfs/xfs_dir2_block.c +27 -27
159 lines not on this page · raw message
fs/xfs/xfs_dir2_data.c +26 -12
@@ -62,12 +62,26 @@ __xfs_dir3_data_check(char *p;/* current data position */ int stale;/* count of stale leaves */ struct xfs_name name; +const struct xfs_dir_ops *ops; mp = bp->b_target->bt_mount; hdr = bp->b_addr; bf =xfs_dir3_data_bestfree_p (hdr); p = (char *)xfs_dir3_data_entry_p (hdr); +/* +* we can be passed a null dp here froma verifier, so manually configure +* the ops here in that case. +*/ +if (dp) + ops = dp->d_ops; +else if (xfs_sb_version_hascrc (&mp->m_sb)) + ops = &xfs_dir3_ops; +else if (xfs_sb_version_hasftype (&mp->m_sb)) + ops = &xfs_dir2_ftype_ops; +else + ops = &xfs_dir2_ops; +switch (hdr->magic) {case cpu_to_be32 (XFS_DIR3_BLOCK_MAGIC ):case cpu_to_be32 (XFS_DIR2_BLOCK_MAGIC ):
@@ -146,10 +160,10 @@ __xfs_dir3_data_check(XFS_WANT_CORRUPTED_RETURN ( !xfs_dir_ino_validate (mp,be64_to_cpu (dep->inumber)));XFS_WANT_CORRUPTED_RETURN ( -be16_to_cpu (*xfs_dir3_data_entry_tag_p (mp, dep)) == +be16_to_cpu (*ops->data_entry_tag_p (dep)) == (char *)dep - (char *)hdr);XFS_WANT_CORRUPTED_RETURN ( -xfs_dir3_dirent_get_ftype (mp, dep) <XFS_DIR3_FT_MAX ); + ops->data_get_ftype (dep) <XFS_DIR3_FT_MAX ); count++; lastfree =0 ; if (hdr->magic == cpu_to_be32(XFS_DIR2_BLOCK_MAGIC) ||
@@ -167,7 +181,7 @@ __xfs_dir3_data_check( }XFS_WANT_CORRUPTED_RETURN (i <be32_to_cpu (btp->count)); } - p +=xfs_dir3_data_entsize (mp, dep->namelen); + p += ops->data_entsize (dep->namelen); }/* * Need to have seen all the entries and all the bestfree slots.
@@ -485,9 +499,9 @@ xfs_dir2_data_freeremove(*/ void xfs_dir2_data_freescan ( -xfs_mount_t *mp,/* filesystem mount point */ -xfs_dir2_data_hdr_t *hdr,/* data block header */ -int *loghead)/* out: log data header */ +struct xfs_inode *dp, +struct xfs_dir2_data_hdr *hdr, +int *loghead) {xfs_dir2_block_tail_t *btp;/* block tail */ xfs_dir2_data_entry_t *dep;/* active data entry */
@@ -513,10 +527,10 @@ xfs_dir2_data_freescan( p = (char *)xfs_dir3_data_entry_p (hdr);if (hdr->magic ==cpu_to_be32 (XFS_DIR2_BLOCK_MAGIC ) || hdr->magic ==cpu_to_be32 (XFS_DIR3_BLOCK_MAGIC )) { - btp =xfs_dir2_block_tail_p (mp, hdr); + btp =xfs_dir2_block_tail_p (dp->i_mount, hdr); endp = (char *)xfs_dir2_block_leaf_p (btp); }else - endp = (char *)hdr + mp->m_dirblksize; + endp = (char *)hdr + dp->i_mount->m_dirblksize;/* * Loop over the block's entries. */
@@ -537,8 +551,8 @@ xfs_dir2_data_freescan(else { dep = (xfs_dir2_data_entry_t *)p;ASSERT ((char *)dep - (char *)hdr == -be16_to_cpu (*xfs_dir3_data_entry_tag_p (mp, dep))); - p +=xfs_dir3_data_entsize (mp, dep->namelen); +be16_to_cpu (*dp->d_ops->data_entry_tag_p (dep))); + p += dp->d_ops->data_entsize (dep->namelen); } } }
@@ -625,11 +639,11 @@ xfs_dir3_data_init(void xfs_dir2_data_log_entry (struct xfs_trans *tp, +struct xfs_inode *dp,struct xfs_buf *bp,xfs_dir2_data_entry_t *dep)/* data entry pointer */ {struct xfs_dir2_data_hdr *hdr = bp->b_addr; -struct xfs_mount *mp = tp->t_mountp; ASSERT(hdr->magic == cpu_to_be32(XFS_DIR2_DATA_MAGIC) || hdr->magic == cpu_to_be32(XFS_DIR3_DATA_MAGIC) ||
@@ -637,7 +651,7 @@ xfs_dir2_data_log_entry( hdr->magic == cpu_to_be32(XFS_DIR3_BLOCK_MAGIC));xfs_trans_log_buf (tp, bp, (uint)((char *)dep - (char *)hdr), - (uint)((char *)(xfs_dir3_data_entry_tag_p (mp, dep) +1 ) - + (uint)((char *)(dp->d_ops->data_entry_tag_p (dep) +1 ) - (char *)hdr -1 )); }
fs/xfs/xfs_dir2_leaf.c +11 -11
@@ -500,7 +500,7 @@ xfs_dir2_block_to_leaf( hdr->magic =cpu_to_be32 (XFS_DIR3_DATA_MAGIC );if (needscan) -xfs_dir2_data_freescan (mp, hdr, &needlog); +xfs_dir2_data_freescan (dp, hdr, &needlog);/* * Set up leaf tail and bests table. */
@@ -700,7 +700,7 @@ xfs_dir2_leaf_addname( ents =xfs_dir3_leaf_ents_p (leaf);xfs_dir3_leaf_hdr_from_disk (&leafhdr, leaf); bestsp =xfs_dir2_leaf_bests_p (ltp); - length =xfs_dir3_data_entsize (mp, args->namelen); + length = dp->d_ops->data_entsize (args->namelen);/* * See if there are any entries with the same hash value
@@ -901,20 +901,20 @@ xfs_dir2_leaf_addname( dep->inumber =cpu_to_be64 (args->inumber); dep->namelen = args->namelen;memcpy (dep->name, args->name, dep->namelen); -xfs_dir3_dirent_put_ftype (mp, dep, args->filetype); - tagp =xfs_dir3_data_entry_tag_p (mp, dep); + dp->d_ops->data_put_ftype (dep, args->filetype); + tagp = dp->d_ops->data_entry_tag_p (dep); *tagp =cpu_to_be16 ((char *)dep - (char *)hdr);/* * Need to scan fix up the bestfree table. */ if (needscan) -xfs_dir2_data_freescan (mp, hdr, &needlog); +xfs_dir2_data_freescan (dp, hdr, &needlog);/* * Need to log the data block's header. */ if (needlog)xfs_dir2_data_log_header (tp, dbp); -xfs_dir2_data_log_entry (tp, dbp, dep); +xfs_dir2_data_log_entry (tp, dp, dbp, dep);/* * If the bests table needs to be changed, do it. * Log the change unless we've already done that.
@@ -1230,7 +1230,7 @@ xfs_dir2_leaf_lookup(* Return the found inode number & CI name if appropriate */ args->inumber =be64_to_cpu (dep->inumber); - args->filetype =xfs_dir3_dirent_get_ftype (dp->i_mount, dep); + args->filetype = dp->d_ops->data_get_ftype (dep); error =xfs_dir_cilookup_result (args, dep->name, dep->namelen);xfs_trans_brelse (tp, dbp);xfs_trans_brelse (tp, lbp);
@@ -1433,7 +1433,7 @@ xfs_dir2_leaf_removename(*/ xfs_dir2_data_make_free (tp, dbp, (xfs_dir2_data_aoff_t)((char *)dep - (char *)hdr), -xfs_dir3_data_entsize (mp, dep->namelen), &needlog, &needscan); + dp->d_ops->data_entsize (dep->namelen), &needlog, &needscan);/* * We just mark the leaf entry stale by putting a null in it. */
@@ -1449,7 +1449,7 @@ xfs_dir2_leaf_removename(* log the data block header if necessary. */ if (needscan) -xfs_dir2_data_freescan (mp, hdr, &needlog); +xfs_dir2_data_freescan (dp, hdr, &needlog);if (needlog)xfs_dir2_data_log_header (tp, dbp);/*
@@ -1561,9 +1561,9 @@ xfs_dir2_leaf_replace(* Put the new inode number in, log it. */ dep->inumber =cpu_to_be64 (args->inumber); -xfs_dir3_dirent_put_ftype (dp->i_mount, dep, args->filetype); + dp->d_ops->data_put_ftype (dep, args->filetype); tp = args->trans; -xfs_dir2_data_log_entry (tp, dbp, dep); +xfs_dir2_data_log_entry (tp, dp, dbp, dep);xfs_dir3_leaf_check (dp->i_mount, lbp);xfs_trans_brelse (tp, lbp);return 0 ;
fs/xfs/xfs_dir2_node.c +12 -11
@@ -604,7 +604,7 @@ xfs_dir2_leafn_lookup_for_addname(ASSERT (free->hdr.magic ==cpu_to_be32 (XFS_DIR2_FREE_MAGIC ) || free->hdr.magic ==cpu_to_be32 (XFS_DIR3_FREE_MAGIC )); } - length =xfs_dir3_data_entsize (mp, args->namelen); + length = dp->d_ops->data_entsize (args->namelen);/* * Loop over leaf entries with the right hash value. */
@@ -815,7 +815,7 @@ xfs_dir2_leafn_lookup_for_entry(xfs_trans_brelse (tp, state->extrablk.bp); args->cmpresult = cmp; args->inumber =be64_to_cpu (dep->inumber); - args->filetype =xfs_dir3_dirent_get_ftype (mp, dep); + args->filetype = dp->d_ops->data_get_ftype (dep); *indexp = index; state->extravalid =1 ; state->extrablk.bp = curbp;
@@ -1259,13 +1259,13 @@ xfs_dir2_leafn_remove( longest =be16_to_cpu (bf[0 ].length); needlog = needscan =0 ;xfs_dir2_data_make_free (tp, dbp, off, -xfs_dir3_data_entsize (mp, dep->namelen), &needlog, &needscan); + dp->d_ops->data_entsize (dep->namelen), &needlog, &needscan);/* * Rescan the data block freespaces for bestfree. * Log the data block header if needed. */ if (needscan) -xfs_dir2_data_freescan (mp, hdr, &needlog); +xfs_dir2_data_freescan (dp, hdr, &needlog);if (needlog)xfs_dir2_data_log_header (tp, dbp);xfs_dir3_data_check (dp, dbp);
@@ -1711,7 +1711,7 @@ xfs_dir2_node_addname_int( dp = args->dp; mp = dp->i_mount; tp = args->trans; - length =xfs_dir3_data_entsize (mp, args->namelen); + length = dp->d_ops->data_entsize (args->namelen);/* * If we came in with a freespace block that means that lookup * found an entry with our hash value. This is the freespace
@@ -2007,15 +2007,15 @@ xfs_dir2_node_addname_int( dep->inumber =cpu_to_be64 (args->inumber); dep->namelen = args->namelen;memcpy (dep->name, args->name, dep->namelen); -xfs_dir3_dirent_put_ftype (mp, dep, args->filetype); - tagp =xfs_dir3_data_entry_tag_p (mp, dep); + dp->d_ops->data_put_ftype (dep, args->filetype); + tagp = dp->d_ops->data_entry_tag_p (dep); *tagp =cpu_to_be16 ((char *)dep - (char *)hdr); -xfs_dir2_data_log_entry (tp, dbp, dep); +xfs_dir2_data_log_entry (tp, dp, dbp, dep);/* * Rescan the block for bestfree if needed. */ if (needscan) -xfs_dir2_data_freescan (mp, hdr, &needlog); +xfs_dir2_data_freescan (dp, hdr, &needlog);/* * Log the data block header if needed. */
@@ -2228,8 +2228,9 @@ xfs_dir2_node_replace(* Fill in the new inode number and log the entry. */ dep->inumber =cpu_to_be64 (inum); -xfs_dir3_dirent_put_ftype (state->mp, dep, args->filetype); -xfs_dir2_data_log_entry (args->trans, state->extrablk.bp, dep); + args->dp->d_ops->data_put_ftype (dep, args->filetype); +xfs_dir2_data_log_entry (args->trans, args->dp, + state->extrablk.bp, dep); rval =0 ; }/*
fs/xfs/xfs_dir2_readdir.c +7 -7
@@ -119,9 +119,9 @@ xfs_dir2_sf_getdents(* mp->m_dirdatablk. */ dot_offset =xfs_dir2_db_off_to_dataptr (mp, mp->m_dirdatablk, -xfs_dir3_data_dot_offset (mp)); + dp->d_ops->data_dot_offset ()); dotdot_offset =xfs_dir2_db_off_to_dataptr (mp, mp->m_dirdatablk, -xfs_dir3_data_dotdot_offset (mp)); + dp->d_ops->data_dotdot_offset ());/* * Put . entry unless we're starting past it.
@@ -237,7 +237,7 @@ xfs_dir2_block_getdents(/* * Bump pointer for the next iteration. */ - ptr +=xfs_dir3_data_entsize (mp, dep->namelen); + ptr += dp->d_ops->data_entsize (dep->namelen);/* * The entry is before the desired starting point, skip it. */
@@ -248,7 +248,7 @@ xfs_dir2_block_getdents( (char *)dep - (char *)hdr); ctx->pos = cook &0x7fffffff ; - filetype =xfs_dir3_dirent_get_ftype (mp, dep); + filetype = dp->d_ops->data_get_ftype (dep);/* * If it didn't fit, set the final offset to here & return. */
@@ -601,7 +601,7 @@ xfs_dir2_leaf_getdents( } dep = (xfs_dir2_data_entry_t *)ptr; length = -xfs_dir3_data_entsize (mp, dep->namelen); + dp->d_ops->data_entsize (dep->namelen); ptr += length; }/*
@@ -632,8 +632,8 @@ xfs_dir2_leaf_getdents( } dep = (xfs_dir2_data_entry_t *)ptr; - length =xfs_dir3_data_entsize (mp, dep->namelen); - filetype =xfs_dir3_dirent_get_ftype (mp, dep); + length = dp->d_ops->data_entsize (dep->namelen); + filetype = dp->d_ops->data_get_ftype (dep); ctx->pos =xfs_dir2_byte_to_dataptr (mp, curoff) &0x7fffffff ; if (!dir_emit(ctx, (char *)dep->name, dep->namelen,
fs/xfs/xfs_dir2_sf.c +10 -10
@@ -251,11 +251,11 @@ xfs_dir2_block_to_sf( dp->d_ops->sf_put_ino (sfp, sfep,be64_to_cpu (dep->inumber)); dp->d_ops->sf_put_ftype (sfep, -xfs_dir3_dirent_get_ftype (mp, dep)); + dp->d_ops->data_get_ftype (dep)); sfep = dp->d_ops->sf_nextentry (sfp, sfep); } - ptr +=xfs_dir3_data_entsize (mp, dep->namelen); + ptr += dp->d_ops->data_entsize (dep->namelen); }ASSERT ((char *)sfep - (char *)sfp == size);xfs_dir2_sf_check (args);
@@ -473,12 +473,12 @@ xfs_dir2_sf_addname_hard(* to insert the new entry. * If it's going to end up at the end then oldsfep will point there. */ -for (offset =xfs_dir3_data_first_offset (mp), +for (offset = dp->d_ops->data_first_offset (), oldsfep =xfs_dir2_sf_firstentry (oldsfp), - add_datasize =xfs_dir3_data_entsize (mp, args->namelen), + add_datasize = dp->d_ops->data_entsize (args->namelen), eof = (char *)oldsfep == &buf[old_isize]; !eof; - offset = new_offset +xfs_dir3_data_entsize (mp, oldsfep->namelen), + offset = new_offset + dp->d_ops->data_entsize (oldsfep->namelen), oldsfep = dp->d_ops->sf_nextentry (oldsfp, oldsfep), eof = (char *)oldsfep == &buf[old_isize]) { new_offset =xfs_dir2_sf_get_offset (oldsfep);
@@ -555,8 +555,8 @@ xfs_dir2_sf_addname_pick( mp = dp->i_mount; sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data; - size =xfs_dir3_data_entsize (mp, args->namelen); - offset =xfs_dir3_data_first_offset (mp); + size = dp->d_ops->data_entsize (args->namelen); + offset = dp->d_ops->data_first_offset (); sfep =xfs_dir2_sf_firstentry (sfp); holefit =0 ;/*
@@ -568,7 +568,7 @@ xfs_dir2_sf_addname_pick(if (!holefit) holefit = offset + size <=xfs_dir2_sf_get_offset (sfep); offset =xfs_dir2_sf_get_offset (sfep) + -xfs_dir3_data_entsize (mp, sfep->namelen); + dp->d_ops->data_entsize (sfep->namelen); sfep = dp->d_ops->sf_nextentry (sfp, sfep); }/*
@@ -629,7 +629,7 @@ xfs_dir2_sf_check( mp = dp->i_mount; sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data; - offset =xfs_dir3_data_first_offset (mp); + offset = dp->d_ops->data_first_offset (); ino = dp->d_ops->sf_get_parent_ino (sfp); i8count = ino >XFS_DIR2_MAX_SHORT_INUM ;
@@ -641,7 +641,7 @@ xfs_dir2_sf_check( i8count += ino >XFS_DIR2_MAX_SHORT_INUM ; offset =xfs_dir2_sf_get_offset (sfep) + -xfs_dir3_data_entsize (mp, sfep->namelen); + dp->d_ops->data_entsize (sfep->namelen);ASSERT (dp->d_ops->sf_get_ftype (sfep) <XFS_DIR3_FT_MAX ); }ASSERT (i8count == sfp->i8count);
Signature · 6 lines
1.8.4.rc3 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 13/19] xfs: vectorise directory data operations
Quoted 9 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Following from the initial patches to vectorise the shortform directory encode/decode operations, convert half the data block operations to use the vector. The rest will be done in a second patch.
This further reduces the size of the built binary:
Quoted 8 lines
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3Signed-off-by Dave Chinner <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>
Generally looks pretty good, I have a question below...
Quoted 8 lines
const struct
xfs_dir_opsxfs_dir2_ftype_ops= {fs/xfs/xfs_da_format.c +3
-0@@ -223,6 +415,18 @@ const struct xfs_dir_ops xfs_dir2_ftype_ops = { .sf_put_ino = xfs_dir3_sfe_put_ino, .sf_get_parent_ino = xfs_dir2_sf_get_parent_ino, .sf_put_parent_ino = xfs_dir2_sf_put_parent_ino, + + .data_entsize = xfs_dir3_data_entsize, + .data_get_ftype = xfs_dir3_data_get_ftype,
fs/xfs/xfs_da_format.c const struct xfs_dir_ops xfs_dir2_ftype_ops = { · line 430
Quoted 10 lines
fs/xfs/xfs_da_format.c +9
-0+ .data_put_ftype = xfs_dir3_data_put_ftype, + .data_entry_tag_p = xfs_dir3_data_entry_tag_p, + + .data_dot_offset = xfs_dir2_data_dot_offset, + .data_dotdot_offset = xfs_dir2_data_dotdot_offset, + .data_first_offset = xfs_dir2_data_first_offset, + .data_dot_entry_p = xfs_dir2_data_dot_entry_p, + .data_dotdot_entry_p = xfs_dir2_data_dotdot_entry_p, + .data_first_entry_p = xfs_dir2_data_first_entry_p, };
I think there may be a problem here. Although the dirv2 functions for ., .., and first entry offset account for the v2 header size, they appear not to be accounting for the modified entry size due to the file type field. Am I missing something?
Quoted 21 lines
fs/xfs/xfs_dir2_block.c +4
-4@@ -1158,32 +1159,32 @@ xfs_dir2_sf_to_block(/* * Create entry for . */ - dep =xfs_dir3_data_dot_entry_p (mp, hdr); + dep = dp->d_ops->data_dot_entry_p (hdr); dep->inumber =cpu_to_be64 (dp->i_ino); dep->namelen =1 ; dep->name[0 ] ='.' ; -xfs_dir3_dirent_put_ftype (mp, dep,XFS_DIR3_FT_DIR ); - tagp =xfs_dir3_data_entry_tag_p (mp, dep); + dp->d_ops->data_put_ftype (dep,XFS_DIR3_FT_DIR ); + tagp = dp->d_ops->data_entry_tag_p (dep); *tagp =cpu_to_be16 ((char *)dep - (char *)hdr); -xfs_dir2_data_log_entry (tp, bp, dep); +xfs_dir2_data_log_entry (tp, dp, bp, dep); blp[0 ].hashval =cpu_to_be32 (xfs_dir_hash_dot); blp[0 ].address =cpu_to_be32 (xfs_dir2_byte_to_dataptr (mp, (char *)dep - (char *)hdr));/* * Create entry for ..
fs/xfs/xfs_dir2_block.c xfs_dir2_sf_to_block( · line 1181
Quoted 10 lines
fs/xfs/xfs_dir2_block.c +3
-3*/ - dep =xfs_dir3_data_dotdot_entry_p (mp, hdr); + dep = dp->d_ops->data_dotdot_entry_p (hdr); dep->inumber =cpu_to_be64 (dp->d_ops->sf_get_parent_ino (sfp)); dep->namelen =2 ; dep->name[0 ] = dep->name[1 ] ='.' ; -xfs_dir3_dirent_put_ftype (mp, dep,XFS_DIR3_FT_DIR ); - tagp =xfs_dir3_data_entry_tag_p (mp, dep); + dp->d_ops->data_put_ftype (dep,XFS_DIR3_FT_DIR ); + tagp =dp->d_ops->data_entry_tag_p (dep);
tagp = dp->d_ops->data_entry_tag_p(dep);
Quoted 7 lines
fs/xfs/xfs_dir2_data.c +0
-0@@ -62,12 +62,26 @@ __xfs_dir3_data_check(char *p;/* current data position */ int stale;/* count of stale leaves */
fs/xfs/xfs_dir2_data.c __xfs_dir3_data_check( · line 73
Quoted 10 lines
fs/xfs/xfs_dir2_data.c +3
-0struct xfs_name name; +const struct xfs_dir_ops *ops; mp = bp->b_target->bt_mount; hdr = bp->b_addr; bf =xfs_dir3_data_bestfree_p (hdr); p = (char *)xfs_dir3_data_entry_p (hdr); +/* +* we can be passed a null dp here froma verifier, so manually configure
from a
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 13/19] xfs: vectorise directory data operations
Quoted 36 lines · Ben Myers
Quoted 9 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Following from the initial patches to vectorise the shortform directory encode/decode operations, convert half the data block operations to use the vector. The rest will be done in a second patch.
This further reduces the size of the built binary:
Quoted 8 lines
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3Signed-off-by Dave Chinner <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Generally looks pretty good, I have a question below...
Quoted 15 lines
const struct
xfs_dir_opsxfs_dir2_ftype_ops= {fs/xfs/xfs_da_format.c +10
-0@@ -223,6 +415,18 @@ const struct xfs_dir_ops xfs_dir2_ftype_ops = { .sf_put_ino = xfs_dir3_sfe_put_ino, .sf_get_parent_ino = xfs_dir2_sf_get_parent_ino, .sf_put_parent_ino = xfs_dir2_sf_put_parent_ino, + + .data_entsize = xfs_dir3_data_entsize, + .data_get_ftype = xfs_dir3_data_get_ftype, + .data_put_ftype = xfs_dir3_data_put_ftype, + .data_entry_tag_p = xfs_dir3_data_entry_tag_p, + + .data_dot_offset = xfs_dir2_data_dot_offset, + .data_dotdot_offset = xfs_dir2_data_dotdot_offset, + .data_first_offset = xfs_dir2_data_first_offset, + .data_dot_entry_p = xfs_dir2_data_dot_entry_p,
Quoted 8 lines
fs/xfs/xfs_da_format.c const struct xfs_dir_ops xfs_dir2_ops = { · line 407
Quoted 3 lines
fs/xfs/xfs_da_format.c +2
-0+ .data_dotdot_entry_p = xfs_dir2_data_dotdot_entry_p, + .data_first_entry_p = xfs_dir2_data_first_entry_p, };I think there may be a problem here. Although the dirv2 functions for ., .., and first entry offset account for the v2 header size, they appear not to be accounting for the modified entry size due to the file type field. Am I missing something?
The ftype field is handled by the alignment roundup. i.e. namelen is 1 or two bytes, plus ftype is 2 or 3 bytes, roundup is to 8 bytes. Hence adding a byte for the ftype field is not a problem for these first entries because of their small, fixed size.
Cheers,
Dave.
Signature · 7 lines
Dave Chinner [email protected] _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 13/19] xfs: vectorise directory data operations
Quoted 46 lines · Dave Chinner
Quoted 36 lines · Ben Myers
Quoted 9 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Following from the initial patches to vectorise the shortform directory encode/decode operations, convert half the data block operations to use the vector. The rest will be done in a second patch.
This further reduces the size of the built binary:
Quoted 8 lines
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3Signed-off-by Dave Chinner <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Generally looks pretty good, I have a question below...
Quoted 15 lines
const struct
xfs_dir_opsxfs_dir2_ftype_ops= {fs/xfs/xfs_da_format.c +10
-0@@ -223,6 +415,18 @@ const struct xfs_dir_ops xfs_dir2_ftype_ops = { .sf_put_ino = xfs_dir3_sfe_put_ino, .sf_get_parent_ino = xfs_dir2_sf_get_parent_ino, .sf_put_parent_ino = xfs_dir2_sf_put_parent_ino, + + .data_entsize = xfs_dir3_data_entsize, + .data_get_ftype = xfs_dir3_data_get_ftype, + .data_put_ftype = xfs_dir3_data_put_ftype, + .data_entry_tag_p = xfs_dir3_data_entry_tag_p, + + .data_dot_offset = xfs_dir2_data_dot_offset, + .data_dotdot_offset = xfs_dir2_data_dotdot_offset, + .data_first_offset = xfs_dir2_data_first_offset, + .data_dot_entry_p = xfs_dir2_data_dot_entry_p,Quoted 8 lines
fs/xfs/xfs_da_format.c const struct xfs_dir_ops xfs_dir2_ops = { · line 407
Quoted 3 lines
fs/xfs/xfs_da_format.c +2
-0+ .data_dotdot_entry_p = xfs_dir2_data_dotdot_entry_p, + .data_first_entry_p = xfs_dir2_data_first_entry_p, };I think there may be a problem here. Although the dirv2 functions for ., .., and first entry offset account for the v2 header size, they appear not to be accounting for the modified entry size due to the file type field. Am I missing something?
Quoted 4 lines
The ftype field is handled by the alignment roundup. i.e. namelen is 1 or two bytes, plus ftype is 2 or 3 bytes, roundup is to 8 bytes. Hence adding a byte for the ftype field is not a problem for these first entries because of their small, fixed size.
It should either be explicitly correct (and I think it is today), or we need a comment to explain why it's not. I would prefer the former.
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 13/19] xfs: vectorise directory data operations
Quoted 47 lines · Ben Myers
Quoted 46 lines · Dave Chinner
Quoted 44 lines · Ben Myers
Quoted 9 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Following from the initial patches to vectorise the shortform directory encode/decode operations, convert half the data block operations to use the vector. The rest will be done in a second patch.
This further reduces the size of the built binary:
Quoted 8 lines
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3Signed-off-by Dave Chinner <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Generally looks pretty good, I have a question below...
Quoted 8 lines
const struct
xfs_dir_opsxfs_dir2_ftype_ops= {fs/xfs/xfs_da_format.c +3
-0@@ -223,6 +415,18 @@ const struct xfs_dir_ops xfs_dir2_ftype_ops = { .sf_put_ino = xfs_dir3_sfe_put_ino, .sf_get_parent_ino = xfs_dir2_sf_get_parent_ino, .sf_put_parent_ino = xfs_dir2_sf_put_parent_ino, + + .data_entsize = xfs_dir3_data_entsize, + .data_get_ftype = xfs_dir3_data_get_ftype,fs/xfs/xfs_da_format.c const struct xfs_dir_ops xfs_dir2_ftype_ops = { · line 430
Quoted 10 lines
fs/xfs/xfs_da_format.c +9
-0+ .data_put_ftype = xfs_dir3_data_put_ftype, + .data_entry_tag_p = xfs_dir3_data_entry_tag_p, + + .data_dot_offset = xfs_dir2_data_dot_offset, + .data_dotdot_offset = xfs_dir2_data_dotdot_offset, + .data_first_offset = xfs_dir2_data_first_offset, + .data_dot_entry_p = xfs_dir2_data_dot_entry_p, + .data_dotdot_entry_p = xfs_dir2_data_dotdot_entry_p, + .data_first_entry_p = xfs_dir2_data_first_entry_p, };I think there may be a problem here. Although the dirv2 functions for ., .., and first entry offset account for the v2 header size, they appear not to be accounting for the modified entry size due to the file type field. Am I missing something?
Quoted 4 lines
Quoted 4 lines
The ftype field is handled by the alignment roundup. i.e. namelen is 1 or two bytes, plus ftype is 2 or 3 bytes, roundup is to 8 bytes. Hence adding a byte for the ftype field is not a problem for these first entries because of their small, fixed size.
I should point out that this code is functionally identical to the way the original macros treated the v4 ftype code. You reviewed that code and tested it and it as such this implicit use of padding was considered perfectly OK just a couple of months ago.....
Quoted 2 lines
It should either be explicitly correct (and I think it is today), or we need a comment to explain why it's not. I would prefer the former.
Well, I'll add a patch at the end of the series to change it. I don't want to have to rebase the rest of the patches in the series just because of the don't apply because of context mismatches.
Besides, the last patch in the series it replaces the offset functions with precalculated values. That replacement fixes the offset calculation to explicitly use dir2 hdrs and dir3 entsizes, so the problem goes away for those entries.
Cheers,
Dave.
Signature · 7 lines
Dave Chinner [email protected] _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 13/19] xfs: vectorise directory data operations
Quoted 53 lines · Dave Chinner
Quoted 47 lines · Ben Myers
Quoted 46 lines · Dave Chinner
Quoted 44 lines · Ben Myers
Quoted 9 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Following from the initial patches to vectorise the shortform directory encode/decode operations, convert half the data block operations to use the vector. The rest will be done in a second patch.
This further reduces the size of the built binary:
Quoted 8 lines
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3Signed-off-by Dave Chinner <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Generally looks pretty good, I have a question below...
Quoted 8 lines
const struct
xfs_dir_opsxfs_dir2_ftype_ops= {fs/xfs/xfs_da_format.c +3
-0@@ -223,6 +415,18 @@ const struct xfs_dir_ops xfs_dir2_ftype_ops = { .sf_put_ino = xfs_dir3_sfe_put_ino, .sf_get_parent_ino = xfs_dir2_sf_get_parent_ino, .sf_put_parent_ino = xfs_dir2_sf_put_parent_ino, + + .data_entsize = xfs_dir3_data_entsize, + .data_get_ftype = xfs_dir3_data_get_ftype,fs/xfs/xfs_da_format.c const struct xfs_dir_ops xfs_dir2_ftype_ops = { · line 430
Quoted 10 lines
fs/xfs/xfs_da_format.c +9
-0+ .data_put_ftype = xfs_dir3_data_put_ftype, + .data_entry_tag_p = xfs_dir3_data_entry_tag_p, + + .data_dot_offset = xfs_dir2_data_dot_offset, + .data_dotdot_offset = xfs_dir2_data_dotdot_offset, + .data_first_offset = xfs_dir2_data_first_offset, + .data_dot_entry_p = xfs_dir2_data_dot_entry_p, + .data_dotdot_entry_p = xfs_dir2_data_dotdot_entry_p, + .data_first_entry_p = xfs_dir2_data_first_entry_p, };I think there may be a problem here. Although the dirv2 functions for ., .., and first entry offset account for the v2 header size, they appear not to be accounting for the modified entry size due to the file type field. Am I missing something?
Quoted 4 lines
Quoted 4 lines
The ftype field is handled by the alignment roundup. i.e. namelen is 1 or two bytes, plus ftype is 2 or 3 bytes, roundup is to 8 bytes. Hence adding a byte for the ftype field is not a problem for these first entries because of their small, fixed size.
Quoted 4 lines
I should point out that this code is functionally identical to the way the original macros treated the v4 ftype code. You reviewed that code and tested it and it as such this implicit use of padding was considered perfectly OK just a couple of months ago.....
It is a detail that I overlooked. I try to do a thorough review... but sometimes things don't register.
Quoted 6 lines
Quoted 2 lines
It should either be explicitly correct (and I think it is today), or we need a comment to explain why it's not. I would prefer the former.
Well, I'll add a patch at the end of the series to change it. I don't want to have to rebase the rest of the patches in the series just because of the don't apply because of context mismatches.
Sounds great.
Quoted 5 lines
Besides, the last patch in the series it replaces the offset functions with precalculated values. That replacement fixes the offset calculation to explicitly use dir2 hdrs and dir3 entsizes, so the problem goes away for those entries.
Ok, I'll look out for it then.
Thanks,
Ben
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 13/19] xfs: vectorise directory data operations
Quoted 72 lines · Ben Myers
Quoted 53 lines · Dave Chinner
Quoted 47 lines · Ben Myers
Quoted 46 lines · Dave Chinner
Quoted 44 lines · Ben Myers
Quoted 9 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Following from the initial patches to vectorise the shortform directory encode/decode operations, convert half the data block operations to use the vector. The rest will be done in a second patch.
This further reduces the size of the built binary:
Quoted 8 lines
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3Signed-off-by Dave Chinner <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Generally looks pretty good, I have a question below...
Quoted 8 lines
const struct
xfs_dir_opsxfs_dir2_ftype_ops= {fs/xfs/xfs_da_format.c +3
-0@@ -223,6 +415,18 @@ const struct xfs_dir_ops xfs_dir2_ftype_ops = { .sf_put_ino = xfs_dir3_sfe_put_ino, .sf_get_parent_ino = xfs_dir2_sf_get_parent_ino, .sf_put_parent_ino = xfs_dir2_sf_put_parent_ino, + + .data_entsize = xfs_dir3_data_entsize, + .data_get_ftype = xfs_dir3_data_get_ftype,fs/xfs/xfs_da_format.c const struct xfs_dir_ops xfs_dir2_ftype_ops = { · line 430
Quoted 10 lines
fs/xfs/xfs_da_format.c +9
-0+ .data_put_ftype = xfs_dir3_data_put_ftype, + .data_entry_tag_p = xfs_dir3_data_entry_tag_p, + + .data_dot_offset = xfs_dir2_data_dot_offset, + .data_dotdot_offset = xfs_dir2_data_dotdot_offset, + .data_first_offset = xfs_dir2_data_first_offset, + .data_dot_entry_p = xfs_dir2_data_dot_entry_p, + .data_dotdot_entry_p = xfs_dir2_data_dotdot_entry_p, + .data_first_entry_p = xfs_dir2_data_first_entry_p, };I think there may be a problem here. Although the dirv2 functions for ., .., and first entry offset account for the v2 header size, they appear not to be accounting for the modified entry size due to the file type field. Am I missing something?
Quoted 4 lines
Quoted 4 lines
The ftype field is handled by the alignment roundup. i.e. namelen is 1 or two bytes, plus ftype is 2 or 3 bytes, roundup is to 8 bytes. Hence adding a byte for the ftype field is not a problem for these first entries because of their small, fixed size.
Quoted 4 lines
I should point out that this code is functionally identical to the way the original macros treated the v4 ftype code. You reviewed that code and tested it and it as such this implicit use of padding was considered perfectly OK just a couple of months ago.....
It is a detail that I overlooked. I try to do a thorough review... but sometimes things don't register.
Quoted 6 lines
Quoted 2 lines
It should either be explicitly correct (and I think it is today), or we need a comment to explain why it's not. I would prefer the former.
Well, I'll add a patch at the end of the series to change it. I don't want to have to rebase the rest of the patches in the series just because of the don't apply because of context mismatches.
Sounds great.
Quoted 1 line
Quoted 6 lines
Quoted 4 lines
Besides, the last patch in the series it replaces the offset functions with precalculated values. That replacement fixes the offset calculation to explicitly use dir2 hdrs and dir3 entsizes, so the problem goes away for those entries.
Ok, I'll look out for it then.
Given you found a few minor problems in the other patches (e.g. hunks in the wrong patches) I'll fix up all the patches and resend the series with all the updated tags on it...
Cheers,
Dave.
Signature · 7 lines
Dave Chinner [email protected] _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
PATCH v2 14/19 xfs: vectorise directory data operations part 2
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Convert the rest of the directory data block encode/decode operations to vector format.
This further reduces the size of the built binary:
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3 789005 96802 1096 886903 d8997 fs/xfs/xfs.o.p4
--- fs/xfs/xfs_da_format.c | 68 +++++++++++++++++++++++++++++ fs/xfs/xfs_da_format.h | 41 ------------------ fs/xfs/xfs_dir2.h | 22 +++++++--- fs/xfs/xfs_dir2_block.c | 33 ++++++++------- fs/xfs/xfs_dir2_data.c | 106 +++++++++++++++++++++++++--------------------- fs/xfs/xfs_dir2_leaf.c | 26 ++++++------ fs/xfs/xfs_dir2_node.c | 16 +++---- fs/xfs/xfs_dir2_priv.h | 3 +- fs/xfs/xfs_dir2_readdir.c | 6 +-- fs/xfs/xfs_dir2_sf.c | 2 +- 10 files changed, 186 insertions(+), 137 deletions(-)
fs/xfs/xfs_da_format.c +68 -0
@@ -383,6 +383,58 @@ xfs_dir3_data_first_entry_p( ((char *)hdr +xfs_dir3_data_first_offset ()); } +static struct xfs_dir2_data_free * +xfs_dir2_data_bestfree_p (struct xfs_dir2_data_hdr *hdr) +{ +return hdr->bestfree; +} + +static struct xfs_dir2_data_free * +xfs_dir3_data_bestfree_p (struct xfs_dir2_data_hdr *hdr) +{ +return ((struct xfs_dir3_data_hdr *)hdr)->best_free; +} + +static size_t +xfs_dir2_data_entry_offset (void ) +{ +return sizeof (struct xfs_dir2_data_hdr ); +} + +static struct xfs_dir2_data_entry * +xfs_dir2_data_entry_p (struct xfs_dir2_data_hdr *hdr) +{ +return (struct xfs_dir2_data_entry *) + ((char *)hdr +xfs_dir2_data_entry_offset ()); +} + +static struct xfs_dir2_data_unused * +xfs_dir2_data_unused_p (struct xfs_dir2_data_hdr *hdr) +{ +return (struct xfs_dir2_data_unused *) + ((char *)hdr +xfs_dir2_data_entry_offset ()); +} + +static size_t +xfs_dir3_data_entry_offset (void ) +{ +return sizeof (struct xfs_dir3_data_hdr ); +} + +static struct xfs_dir2_data_entry * +xfs_dir3_data_entry_p (struct xfs_dir2_data_hdr *hdr) +{ +return (struct xfs_dir2_data_entry *) + ((char *)hdr +xfs_dir3_data_entry_offset ()); +} + +static struct xfs_dir2_data_unused * +xfs_dir3_data_unused_p (struct xfs_dir2_data_hdr *hdr) +{ +return (struct xfs_dir2_data_unused *) + ((char *)hdr +xfs_dir3_data_entry_offset ()); +} +const struct xfs_dir_ops xfs_dir2_ops = { .sf_entsize = xfs_dir2_sf_entsize, .sf_nextentry = xfs_dir2_sf_nextentry,
@@ -397,13 +449,19 @@ const struct xfs_dir_ops xfs_dir2_ops = { .data_get_ftype = xfs_dir2_data_get_ftype, .data_put_ftype = xfs_dir2_data_put_ftype, .data_entry_tag_p = xfs_dir2_data_entry_tag_p, + .data_bestfree_p = xfs_dir2_data_bestfree_p, .data_dot_offset = xfs_dir2_data_dot_offset, .data_dotdot_offset = xfs_dir2_data_dotdot_offset, .data_first_offset = xfs_dir2_data_first_offset, + .data_entry_offset = xfs_dir2_data_entry_offset, + .data_dot_entry_p = xfs_dir2_data_dot_entry_p, .data_dotdot_entry_p = xfs_dir2_data_dotdot_entry_p, .data_first_entry_p = xfs_dir2_data_first_entry_p, + .data_entry_p = xfs_dir2_data_entry_p, + .data_unused_p = xfs_dir2_data_unused_p, + };const struct xfs_dir_ops xfs_dir2_ftype_ops = {
@@ -420,13 +478,18 @@ const struct xfs_dir_ops xfs_dir2_ftype_ops = { .data_get_ftype = xfs_dir3_data_get_ftype, .data_put_ftype = xfs_dir3_data_put_ftype, .data_entry_tag_p = xfs_dir3_data_entry_tag_p, + .data_bestfree_p = xfs_dir2_data_bestfree_p, .data_dot_offset = xfs_dir2_data_dot_offset, .data_dotdot_offset = xfs_dir2_data_dotdot_offset, .data_first_offset = xfs_dir2_data_first_offset, + .data_entry_offset = xfs_dir2_data_entry_offset, + .data_dot_entry_p = xfs_dir2_data_dot_entry_p, .data_dotdot_entry_p = xfs_dir2_data_dotdot_entry_p, .data_first_entry_p = xfs_dir2_data_first_entry_p, + .data_entry_p = xfs_dir2_data_entry_p, + .data_unused_p = xfs_dir2_data_unused_p, };const struct xfs_dir_ops xfs_dir3_ops = {
@@ -443,11 +506,16 @@ const struct xfs_dir_ops xfs_dir3_ops = { .data_get_ftype = xfs_dir3_data_get_ftype, .data_put_ftype = xfs_dir3_data_put_ftype, .data_entry_tag_p = xfs_dir3_data_entry_tag_p, + .data_bestfree_p = xfs_dir3_data_bestfree_p, .data_dot_offset = xfs_dir3_data_dot_offset, .data_dotdot_offset = xfs_dir3_data_dotdot_offset, .data_first_offset = xfs_dir3_data_first_offset, + .data_entry_offset = xfs_dir3_data_entry_offset, + .data_dot_entry_p = xfs_dir3_data_dot_entry_p, .data_dotdot_entry_p = xfs_dir3_data_dotdot_entry_p, .data_first_entry_p = xfs_dir3_data_first_entry_p, + .data_entry_p = xfs_dir3_data_entry_p, + .data_unused_p = xfs_dir3_data_unused_p, };
fs/xfs/xfs_da_format.h +0 -41
53 lines not on this page · raw message
fs/xfs/xfs_dir2.h +16 -6
@@ -56,16 +56,24 @@ struct xfs_dir_ops {void (*data_put_ftype)(struct xfs_dir2_data_entry *dep,__uint8_t ftype);__be16 * (*data_entry_tag_p)(struct xfs_dir2_data_entry *dep); +struct xfs_dir2_data_free * + (*data_bestfree_p)(struct xfs_dir2_data_hdr *hdr);xfs_dir2_data_aoff_t (*data_dot_offset)(void);xfs_dir2_data_aoff_t (*data_dotdot_offset)(void);xfs_dir2_data_aoff_t (*data_first_offset)(void); +size_t (*data_entry_offset)(void ); +struct xfs_dir2_data_entry * (*data_dot_entry_p)(struct xfs_dir2_data_hdr *hdr);struct xfs_dir2_data_entry * (*data_dotdot_entry_p)(struct xfs_dir2_data_hdr *hdr);struct xfs_dir2_data_entry * (*data_first_entry_p)(struct xfs_dir2_data_hdr *hdr); +struct xfs_dir2_data_entry * + (*data_entry_p)(struct xfs_dir2_data_hdr *hdr); +struct xfs_dir2_data_unused * + (*data_unused_p)(struct xfs_dir2_data_hdr *hdr); };extern const struct xfs_dir_ops xfs_dir2_ops;
@@ -115,19 +123,21 @@ extern void xfs_dir2_data_freescan(struct xfs_inode *dp, struct xfs_dir2_data_hdr *hdr, int *loghead);extern void xfs_dir2_data_log_entry (struct xfs_trans *tp,struct xfs_inode *dp,struct xfs_buf *bp,struct xfs_dir2_data_entry *dep); -extern void xfs_dir2_data_log_header (struct xfs_trans *tp, +extern void xfs_dir2_data_log_header (struct xfs_trans *tp,struct xfs_inode *dp,struct xfs_buf *bp);extern void xfs_dir2_data_log_unused (struct xfs_trans *tp,struct xfs_buf *bp,struct xfs_dir2_data_unused *dup); -extern void xfs_dir2_data_make_free (struct xfs_trans *tp,struct xfs_buf *bp, +extern void xfs_dir2_data_make_free (struct xfs_trans *tp,struct xfs_inode *dp, +struct xfs_buf *bp,xfs_dir2_data_aoff_t offset, +xfs_dir2_data_aoff_t len,int *needlogp,int *needscanp); +extern void xfs_dir2_data_use_free (struct xfs_trans *tp,struct xfs_inode *dp, +struct xfs_buf *bp,struct xfs_dir2_data_unused *dup,xfs_dir2_data_aoff_t offset,xfs_dir2_data_aoff_t len,int *needlogp,int *needscanp); -extern void xfs_dir2_data_use_free (struct xfs_trans *tp,struct xfs_buf *bp, -struct xfs_dir2_data_unused *dup,xfs_dir2_data_aoff_t offset, -xfs_dir2_data_aoff_t len,int *needlogp,int *needscanp);extern struct xfs_dir2_data_free *xfs_dir2_data_freefind ( -struct xfs_dir2_data_hdr *hdr,struct xfs_dir2_data_unused *dup); +struct xfs_dir2_data_hdr *hdr,struct xfs_dir2_data_free *bf, +struct xfs_dir2_data_unused *dup);extern const struct xfs_buf_ops xfs_dir3_block_buf_ops;extern const struct xfs_buf_ops xfs_dir3_leafn_buf_ops;
fs/xfs/xfs_dir2_block.c +18 -15
@@ -168,6 +168,7 @@ xfs_dir3_block_init( static void xfs_dir2_block_need_space( + struct xfs_inode *dp, struct xfs_dir2_data_hdr *hdr, struct xfs_dir2_block_tail *btp, struct xfs_dir2_leaf_entry *blp,
@@ -183,7 +184,7 @@ xfs_dir2_block_need_space(struct xfs_dir2_data_unused *enddup =NULL ; *compact =0 ; - bf =xfs_dir3_data_bestfree_p (hdr); + bf = dp->d_ops->data_bestfree_p (hdr);/* * If there are stale entries we'll use one for the leaf.
@@ -313,7 +314,7 @@ xfs_dir2_block_compact( *lfloglow = toidx +1 - (be32_to_cpu (btp->stale) -1 ); *lfloghigh -=be32_to_cpu (btp->stale) -1 ;be32_add_cpu (&btp->count, -(be32_to_cpu (btp->stale) -1 )); -xfs_dir2_data_make_free (tp, bp, +xfs_dir2_data_make_free (tp, dp, bp, (xfs_dir2_data_aoff_t)((char *)blp - (char *)hdr), (xfs_dir2_data_aoff_t)((be32_to_cpu (btp->stale) -1 ) *sizeof (*blp)), needlog, &needscan);
@@ -383,7 +384,7 @@ xfs_dir2_block_addname(* Find out if we can reuse stale entries or whether we need extra * space for entry and new leaf. */ -xfs_dir2_block_need_space (hdr, btp, blp, &tagp, &dup, +xfs_dir2_block_need_space (dp, hdr, btp, blp, &tagp, &dup, &enddup, &compact, len);/*
@@ -454,7 +455,7 @@ xfs_dir2_block_addname(/* * Mark the space needed for the new leaf entry, now in use. */ - xfs_dir2_data_use_free(tp, bp, enddup, + xfs_dir2_data_use_free(tp, dp, bp, enddup, (xfs_dir2_data_aoff_t) ((char *)enddup - (char *)hdr + be16_to_cpu(enddup->length) - sizeof(*blp)),
@@ -541,7 +542,7 @@ xfs_dir2_block_addname(/* * Mark space for the data entry used. */ -xfs_dir2_data_use_free (tp, bp, dup, +xfs_dir2_data_use_free (tp, dp, bp, dup, (xfs_dir2_data_aoff_t)((char *)dup - (char *)hdr), (xfs_dir2_data_aoff_t )len, &needlog, &needscan);/*
@@ -559,7 +560,7 @@ xfs_dir2_block_addname(if (needscan)xfs_dir2_data_freescan (dp, hdr, &needlog);if (needlog) -xfs_dir2_data_log_header (tp, bp); +xfs_dir2_data_log_header (tp, dp, bp);xfs_dir2_block_log_tail (tp, bp);xfs_dir2_data_log_entry (tp, dp, bp, dep);xfs_dir3_data_check (dp, bp);
@@ -800,7 +801,7 @@ xfs_dir2_block_removename(* Mark the data entry's space free. */ needlog = needscan =0 ; -xfs_dir2_data_make_free (tp, bp, +xfs_dir2_data_make_free (tp, dp, bp, (xfs_dir2_data_aoff_t)((char *)dep - (char *)hdr), dp->d_ops->data_entsize (dep->namelen), &needlog, &needscan);/*
@@ -819,7 +820,7 @@ xfs_dir2_block_removename(if (needscan)xfs_dir2_data_freescan (dp, hdr, &needlog);if (needlog) -xfs_dir2_data_log_header (tp, bp); +xfs_dir2_data_log_header (tp, dp, bp);xfs_dir3_data_check (dp, bp);/* * See if the size as a shortform is good enough.
@@ -950,7 +951,7 @@ xfs_dir2_leaf_to_block(while (dp->i_d.di_size > mp->m_dirblksize) {int hdrsz; - hdrsz =xfs_dir3_data_hdr_size (xfs_sb_version_hascrc (&mp->m_sb)); + hdrsz = dp->d_ops->data_entry_offset (); bestsp =xfs_dir2_leaf_bests_p (ltp);if (be16_to_cpu (bestsp[be32_to_cpu (ltp->bestcount) -1 ]) == mp->m_dirblksize - hdrsz) {
@@ -1000,7 +1001,7 @@ xfs_dir2_leaf_to_block(/* * Use up the space at the end of the block (blp/btp). */ -xfs_dir2_data_use_free (tp, dbp, dup, mp->m_dirblksize - size, size, +xfs_dir2_data_use_free (tp, dp, dbp, dup, mp->m_dirblksize - size, size, &needlog, &needscan);/* * Initialize the block tail.
@@ -1026,7 +1027,7 @@ xfs_dir2_leaf_to_block(if (needscan)xfs_dir2_data_freescan (dp, hdr, &needlog);if (needlog) -xfs_dir2_data_log_header (tp, dbp); +xfs_dir2_data_log_header (tp, dp, dbp);/* * Pitch the old leaf block. */
@@ -1137,9 +1138,9 @@ xfs_dir2_sf_to_block(* The whole thing is initialized to free by the init routine. * Say we're using the leaf and tail area. */ - dup =xfs_dir3_data_unused_p (hdr); + dup = dp->d_ops->data_unused_p (hdr); needlog = needscan =0 ; -xfs_dir2_data_use_free (tp, bp, dup, mp->m_dirblksize - i, i, &needlog, +xfs_dir2_data_use_free (tp, dp, bp, dup, mp->m_dirblksize - i, i, &needlog, &needscan);ASSERT (needscan ==0 );/*
@@ -1153,7 +1154,7 @@ xfs_dir2_sf_to_block(/* * Remove the freespace, we'll manage it. */ -xfs_dir2_data_use_free (tp, bp, dup, +xfs_dir2_data_use_free (tp, dp, bp, dup, (xfs_dir2_data_aoff_t)((char *)dup - (char *)hdr),be16_to_cpu (dup->length), &needlog, &needscan);/*
@@ -1215,7 +1216,9 @@ xfs_dir2_sf_to_block( *xfs_dir2_data_unused_tag_p (dup) =cpu_to_be16 ( ((char *)dup - (char *)hdr));xfs_dir2_data_log_unused (tp, bp, dup); -xfs_dir2_data_freeinsert (hdr, dup, &dummy); +xfs_dir2_data_freeinsert (hdr, + dp->d_ops->data_bestfree_p (hdr), + dup, &dummy); offset +=be16_to_cpu (dup->length);continue ; }
fs/xfs/xfs_dir2_data.c +57 -49
318 lines not on this page · raw message
fs/xfs/xfs_dir2_leaf.c +13 -13
@@ -460,7 +460,7 @@ xfs_dir2_block_to_leaf(xfs_dir3_data_check (dp, dbp); btp =xfs_dir2_block_tail_p (mp, hdr); blp =xfs_dir2_block_leaf_p (btp); - bf =xfs_dir3_data_bestfree_p (hdr); + bf = dp->d_ops->data_bestfree_p (hdr); ents =xfs_dir3_leaf_ents_p (leaf);/*
@@ -484,7 +484,7 @@ xfs_dir2_block_to_leaf(* Make the space formerly occupied by the leaf entries and block * tail be free. */ - xfs_dir2_data_make_free(tp, dbp, + xfs_dir2_data_make_free(tp, dp, dbp, (xfs_dir2_data_aoff_t)((char *)blp - (char *)hdr), (xfs_dir2_data_aoff_t)((char *)hdr + mp->m_dirblksize - (char *)blp),
@@ -512,7 +512,7 @@ xfs_dir2_block_to_leaf(* Log the data header and leaf bests table. */ if (needlog) -xfs_dir2_data_log_header (tp, dbp); +xfs_dir2_data_log_header (tp, dp, dbp);xfs_dir3_leaf_check (mp, lbp);xfs_dir3_data_check (dp, dbp);xfs_dir3_leaf_log_bests (tp, lbp,0 ,0 );
@@ -862,7 +862,7 @@ xfs_dir2_leaf_addname(else xfs_dir3_leaf_log_bests (tp, lbp, use_block, use_block); hdr = dbp->b_addr; - bf =xfs_dir3_data_bestfree_p (hdr); + bf = dp->d_ops->data_bestfree_p (hdr); bestsp[use_block] = bf[0 ].length; grown =1 ; }else {
@@ -878,7 +878,7 @@ xfs_dir2_leaf_addname(return error; } hdr = dbp->b_addr; - bf =xfs_dir3_data_bestfree_p (hdr); + bf = dp->d_ops->data_bestfree_p (hdr); grown =0 ; }/*
@@ -891,7 +891,7 @@ xfs_dir2_leaf_addname(/* * Mark the initial part of our freespace in use for the new entry. */ -xfs_dir2_data_use_free (tp, dbp, dup, +xfs_dir2_data_use_free (tp, dp, dbp, dup, (xfs_dir2_data_aoff_t)((char *)dup - (char *)hdr), length, &needlog, &needscan);/*
@@ -913,7 +913,7 @@ xfs_dir2_leaf_addname(* Need to log the data block's header. */ if (needlog) -xfs_dir2_data_log_header (tp, dbp); +xfs_dir2_data_log_header (tp, dp, dbp);xfs_dir2_data_log_entry (tp, dp, dbp, dep);/* * If the bests table needs to be changed, do it.
@@ -1413,7 +1413,7 @@ xfs_dir2_leaf_removename( leaf = lbp->b_addr; hdr = dbp->b_addr;xfs_dir3_data_check (dp, dbp); - bf =xfs_dir3_data_bestfree_p (hdr); + bf = dp->d_ops->data_bestfree_p (hdr);xfs_dir3_leaf_hdr_from_disk (&leafhdr, leaf); ents =xfs_dir3_leaf_ents_p (leaf);/*
@@ -1431,7 +1431,7 @@ xfs_dir2_leaf_removename(/* * Mark the former data entry unused. */ -xfs_dir2_data_make_free (tp, dbp, +xfs_dir2_data_make_free (tp, dp, dbp, (xfs_dir2_data_aoff_t)((char *)dep - (char *)hdr), dp->d_ops->data_entsize (dep->namelen), &needlog, &needscan);/*
@@ -1451,7 +1451,7 @@ xfs_dir2_leaf_removename(if (needscan)xfs_dir2_data_freescan (dp, hdr, &needlog);if (needlog) -xfs_dir2_data_log_header (tp, dbp); +xfs_dir2_data_log_header (tp, dp, dbp);/* * If the longest freespace in the data block has changed, * put the new value in the bests table and log that.
@@ -1465,7 +1465,7 @@ xfs_dir2_leaf_removename(* If the data block is now empty then get rid of the data block. */ if (be16_to_cpu (bf[0 ].length) == - mp->m_dirblksize -xfs_dir3_data_entry_offset (hdr)) { + mp->m_dirblksize - dp->d_ops->data_entry_offset ()) {ASSERT (db != mp->m_dirdatablk);if ((error =xfs_dir2_shrink_inode (args, db, dbp))) {/*
@@ -1659,12 +1659,12 @@ xfs_dir2_leaf_trim_data(#ifdef DEBUG {struct xfs_dir2_data_hdr *hdr = dbp->b_addr; -struct xfs_dir2_data_free *bf =xfs_dir3_data_bestfree_p (hdr); +struct xfs_dir2_data_free *bf = dp->d_ops->data_bestfree_p (hdr);ASSERT (hdr->magic ==cpu_to_be32 (XFS_DIR2_DATA_MAGIC ) || hdr->magic ==cpu_to_be32 (XFS_DIR3_DATA_MAGIC ));ASSERT (be16_to_cpu (bf[0 ].length) == - mp->m_dirblksize -xfs_dir3_data_entry_offset (hdr)); + mp->m_dirblksize - dp->d_ops->data_entry_offset ());ASSERT (db ==be32_to_cpu (ltp->bestcount) -1 ); }#endif
fs/xfs/xfs_dir2_node.c +8 -8
@@ -1255,10 +1255,10 @@ xfs_dir2_leafn_remove( dbp = dblk->bp; hdr = dbp->b_addr; dep = (xfs_dir2_data_entry_t *)((char *)hdr + off); - bf =xfs_dir3_data_bestfree_p (hdr); + bf = dp->d_ops->data_bestfree_p (hdr); longest =be16_to_cpu (bf[0 ].length); needlog = needscan =0 ; -xfs_dir2_data_make_free (tp, dbp, off, +xfs_dir2_data_make_free (tp, dp, dbp, off, dp->d_ops->data_entsize (dep->namelen), &needlog, &needscan);/* * Rescan the data block freespaces for bestfree.
@@ -1267,7 +1267,7 @@ xfs_dir2_leafn_remove(if (needscan)xfs_dir2_data_freescan (dp, hdr, &needlog);if (needlog) -xfs_dir2_data_log_header (tp, dbp); +xfs_dir2_data_log_header (tp, dp, dbp);xfs_dir3_data_check (dp, dbp);/* * If the longest data block freespace changes, need to update
@@ -1308,7 +1308,7 @@ xfs_dir2_leafn_remove(* (usually). */ if (longest == mp->m_dirblksize - -xfs_dir3_data_entry_offset (hdr)) { + dp->d_ops->data_entry_offset ()) {/* * Try to punch out the data block. */
@@ -1962,7 +1962,7 @@ xfs_dir2_node_addname_int(* change again. */ hdr = dbp->b_addr; - bf =xfs_dir3_data_bestfree_p (hdr); + bf = dp->d_ops->data_bestfree_p (hdr); bests[findex] = bf[0 ].length; logfree =1 ; }
@@ -1984,7 +1984,7 @@ xfs_dir2_node_addname_int(if (error)return error; hdr = dbp->b_addr; - bf =xfs_dir3_data_bestfree_p (hdr); + bf = dp->d_ops->data_bestfree_p (hdr); logfree =0 ; }ASSERT (be16_to_cpu (bf[0 ].length) >= length);
@@ -1997,7 +1997,7 @@ xfs_dir2_node_addname_int(/* * Mark the first part of the unused space, inuse for us. */ -xfs_dir2_data_use_free (tp, dbp, dup, +xfs_dir2_data_use_free (tp, dp, dbp, dup, (xfs_dir2_data_aoff_t)((char *)dup - (char *)hdr), length, &needlog, &needscan);/*
@@ -2020,7 +2020,7 @@ xfs_dir2_node_addname_int(* Log the data block header if needed. */ if (needlog) -xfs_dir2_data_log_header (tp, dbp); +xfs_dir2_data_log_header (tp, dp, dbp);/* * If the freespace entry is now wrong, update it. */
fs/xfs/xfs_dir2_priv.h +2 -1
@@ -59,7 +59,8 @@ extern int xfs_dir3_data_readahead(struct xfs_trans *tp, struct xfs_inode *dp,extern struct xfs_dir2_data_free *xfs_dir2_data_freeinsert (struct xfs_dir2_data_hdr *hdr, -struct xfs_dir2_data_unused *dup,int *loghead); +struct xfs_dir2_data_free *bf,struct xfs_dir2_data_unused *dup, +int *loghead);extern int xfs_dir3_data_init (struct xfs_da_args *args,xfs_dir2_db_t blkno,struct xfs_buf **bpp);
fs/xfs/xfs_dir2_readdir.c +3 -3
@@ -213,7 +213,7 @@ xfs_dir2_block_getdents(* Set up values for the loop. */ btp =xfs_dir2_block_tail_p (mp, hdr); - ptr = (char *)xfs_dir3_data_entry_p (hdr); + ptr = (char *)dp->d_ops->data_entry_p (hdr); endptr = (char *)xfs_dir2_block_leaf_p (btp);/*
@@ -578,13 +578,13 @@ xfs_dir2_leaf_getdents(/* * Find our position in the block. */ - ptr = (char *)xfs_dir3_data_entry_p (hdr); + ptr = (char *)dp->d_ops->data_entry_p (hdr); byteoff =xfs_dir2_byte_to_off (mp, curoff);/* * Skip past the header. */ if (byteoff ==0 ) - curoff +=xfs_dir3_data_entry_offset (hdr); + curoff += dp->d_ops->data_entry_offset ();/* * Skip past entries until we reach our offset. */
fs/xfs/xfs_dir2_sf.c +1 -1
@@ -210,7 +210,7 @@ xfs_dir2_block_to_sf(* Set up to loop over the block's entries. */ btp =xfs_dir2_block_tail_p (mp, hdr); - ptr = (char *)xfs_dir3_data_entry_p (hdr); + ptr = (char *)dp->d_ops->data_entry_p (hdr); endptr = (char *)xfs_dir2_block_leaf_p (btp); sfep =xfs_dir2_sf_firstentry (sfp);/*
Signature · 6 lines
1.8.4.rc3 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
PATCH v2 15/19 xfs: vectorise directory leaf operations
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Next step in the vectorisation process is the leaf block encode/decode operations. Most of the operations on leaves are handled by the data block vectors, so there are relatively few of them here.
Because of all the shuffling of code and having to pass more state to some functions, this patch doesn't directly reduce the size of the binary. It does open up many more opportunities for factoring and optimisation, however.
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3 789005 96802 1096 886903 d8997 fs/xfs/xfs.o.p4 789061 96802 1096 886959 d88af fs/xfs/xfs.o.p5
--- fs/xfs/xfs_da_btree.c | 19 ++++---- fs/xfs/xfs_da_format.c | 75 +++++++++++++++++++++++++++++++ fs/xfs/xfs_da_format.h | 30 ------------- fs/xfs/xfs_dir2.c | 7 +-- fs/xfs/xfs_dir2.h | 10 +++-- fs/xfs/xfs_dir2_block.c | 2 +- fs/xfs/xfs_dir2_data.c | 13 ++---- fs/xfs/xfs_dir2_leaf.c | 91 +++++++++++++++++++++----------------- fs/xfs/xfs_dir2_node.c | 115 ++++++++++++++++++++++++++---------------------- fs/xfs/xfs_dir2_priv.h | 13 +++--- 10 files changed, 217 insertions(+), 158 deletions(-)
fs/xfs/xfs_da_btree.c +10 -9
@@ -605,7 +605,7 @@ xfs_da3_root_split( leaf = (xfs_dir2_leaf_t *)oldroot;xfs_dir3_leaf_hdr_from_disk (&leafhdr, leaf); - ents =xfs_dir3_leaf_ents_p (leaf); + ents = dp->d_ops->leaf_ents_p (leaf);ASSERT (leafhdr.magic ==XFS_DIR2_LEAFN_MAGIC || leafhdr.magic ==XFS_DIR3_LEAFN_MAGIC );
@@ -1319,7 +1319,8 @@ xfs_da3_fixhashpath(return ;break ;case XFS_DIR2_LEAFN_MAGIC : - lasthash =xfs_dir2_leafn_lasthash (blk->bp, &count); + lasthash =xfs_dir2_leafn_lasthash (state->args->dp, + blk->bp, &count);if (count ==0 )return ;break ;
@@ -1536,7 +1537,8 @@ xfs_da3_node_lookup_int(if (blk->magic ==XFS_DIR2_LEAFN_MAGIC || blk->magic ==XFS_DIR3_LEAFN_MAGIC ) { blk->magic =XFS_DIR2_LEAFN_MAGIC ; - blk->hashval =xfs_dir2_leafn_lasthash (blk->bp,NULL ); + blk->hashval =xfs_dir2_leafn_lasthash (args->dp, + blk->bp,NULL );break ; }
@@ -1702,7 +1704,7 @@ xfs_da3_blk_link( before =xfs_attr_leaf_order (old_blk->bp, new_blk->bp);break ;case XFS_DIR2_LEAFN_MAGIC : - before =xfs_dir2_leafn_order (old_blk->bp, new_blk->bp); + before =xfs_dir2_leafn_order (args->dp, old_blk->bp, new_blk->bp);break ;case XFS_DA_NODE_MAGIC : before =xfs_da3_node_order (old_blk->bp, new_blk->bp);
@@ -1947,16 +1949,15 @@ xfs_da3_path_shift( blk->magic =XFS_ATTR_LEAF_MAGIC ;ASSERT (level == path->active-1 ); blk->index =0 ; - blk->hashval =xfs_attr_leaf_lasthash (blk->bp, -NULL ); + blk->hashval =xfs_attr_leaf_lasthash (blk->bp,NULL );break ;case XFS_DIR2_LEAFN_MAGIC :case XFS_DIR3_LEAFN_MAGIC : blk->magic =XFS_DIR2_LEAFN_MAGIC ;ASSERT (level == path->active-1 ); blk->index =0 ; - blk->hashval =xfs_dir2_leafn_lasthash (blk->bp, -NULL ); + blk->hashval =xfs_dir2_leafn_lasthash (args->dp, + blk->bp,NULL );break ;default :ASSERT (0 );
@@ -2223,7 +2224,7 @@ xfs_da3_swap_lastblock( dead_leaf2 = (xfs_dir2_leaf_t *)dead_info;xfs_dir3_leaf_hdr_from_disk (&leafhdr, dead_leaf2); - ents =xfs_dir3_leaf_ents_p (dead_leaf2); + ents = ip->d_ops->leaf_ents_p (dead_leaf2); dead_level =0 ; dead_hash =be32_to_cpu (ents[leafhdr.count -1 ].hashval); }else {
fs/xfs/xfs_da_format.c +75 -0
97 lines not on this page · raw message
fs/xfs/xfs_da_format.h +0 -30
@@ -551,36 +551,6 @@ struct xfs_dir3_leaf {extern void xfs_dir3_leaf_hdr_from_disk (struct xfs_dir3_icleaf_hdr *to,struct xfs_dir2_leaf *from); -static inline int -xfs_dir3_leaf_hdr_size (struct xfs_dir2_leaf *lp) -{ -if (lp->hdr.info.magic ==cpu_to_be16 (XFS_DIR3_LEAF1_MAGIC ) || - lp->hdr.info.magic ==cpu_to_be16 (XFS_DIR3_LEAFN_MAGIC )) -return sizeof (struct xfs_dir3_leaf_hdr ); -return sizeof (struct xfs_dir2_leaf_hdr ); -} - -static inline int -xfs_dir3_max_leaf_ents (struct xfs_mount *mp,struct xfs_dir2_leaf *lp) -{ -return (mp->m_dirblksize -xfs_dir3_leaf_hdr_size (lp)) / - (uint )sizeof (struct xfs_dir2_leaf_entry ); -} - -/* -* Get address of the bestcount field in the single-leaf block. -*/ -static inline struct xfs_dir2_leaf_entry * -xfs_dir3_leaf_ents_p (struct xfs_dir2_leaf *lp) -{ -if (lp->hdr.info.magic ==cpu_to_be16 (XFS_DIR3_LEAF1_MAGIC ) || - lp->hdr.info.magic ==cpu_to_be16 (XFS_DIR3_LEAFN_MAGIC )) { -struct xfs_dir3_leaf *lp3 = (struct xfs_dir3_leaf *)lp; -return lp3->__ents; - } -return lp->__ents; -} -/* * Get address of the bestcount field in the single-leaf block. */
fs/xfs/xfs_dir2.c +1 -6
@@ -113,12 +113,7 @@ xfs_dir_mount(else mp->m_dirnameops = &xfs_default_nameops; -if (xfs_sb_version_hascrc (&mp->m_sb)) - mp->m_dir_inode_ops = &xfs_dir3_ops; -else if (xfs_sb_version_hasftype (&mp->m_sb)) - mp->m_dir_inode_ops = &xfs_dir2_ftype_ops; -else - mp->m_dir_inode_ops = &xfs_dir2_ops; + mp->m_dir_inode_ops =xfs_dir_get_ops (mp,NULL ); }/*
fs/xfs/xfs_dir2.h +7 -3
@@ -74,11 +74,15 @@ struct xfs_dir_ops { (*data_entry_p)(struct xfs_dir2_data_hdr *hdr);struct xfs_dir2_data_unused * (*data_unused_p)(struct xfs_dir2_data_hdr *hdr); + +int (*leaf_hdr_size)(void ); +int (*leaf_max_ents)(struct xfs_mount *mp); +struct xfs_dir2_leaf_entry * + (*leaf_ents_p)(struct xfs_dir2_leaf *lp); }; -extern const struct xfs_dir_ops xfs_dir2_ops; -extern const struct xfs_dir_ops xfs_dir2_ftype_ops; -extern const struct xfs_dir_ops xfs_dir3_ops; +extern const struct xfs_dir_ops * +xfs_dir_get_ops (struct xfs_mount *mp,struct xfs_inode *dp);/* * Generic directory interface routines
fs/xfs/xfs_dir2_block.c +1 -1
@@ -937,7 +937,7 @@ xfs_dir2_leaf_to_block( mp = dp->i_mount; leaf = lbp->b_addr;xfs_dir3_leaf_hdr_from_disk (&leafhdr, leaf); - ents =xfs_dir3_leaf_ents_p (leaf); + ents = dp->d_ops->leaf_ents_p (leaf); ltp =xfs_dir2_leaf_tail_p (mp, leaf); ASSERT(leafhdr.magic == XFS_DIR2_LEAF1_MAGIC ||
fs/xfs/xfs_dir2_data.c +3 -10
@@ -68,17 +68,10 @@ __xfs_dir3_data_check( hdr = bp->b_addr;/* -* we can be passed a null dp here froma verifier, so manually configure -* the ops here in that case. +* we can be passed a null dp here from a verifier, so we need to go the +* hard way to get them. */ -if (dp) - ops = dp->d_ops; -else if (xfs_sb_version_hascrc (&mp->m_sb)) - ops = &xfs_dir3_ops; -else if (xfs_sb_version_hasftype (&mp->m_sb)) - ops = &xfs_dir2_ftype_ops; -else - ops = &xfs_dir2_ops; + ops =xfs_dir_get_ops (mp, dp);switch (hdr->magic) {case cpu_to_be32 (XFS_DIR3_BLOCK_MAGIC ):
fs/xfs/xfs_dir2_leaf.c +51 -40
280 lines not on this page · raw message
fs/xfs/xfs_dir2_node.c +62 -53
343 lines not on this page · raw message
fs/xfs/xfs_dir2_priv.h +7 -6
@@ -77,9 +77,9 @@ extern void xfs_dir3_leaf_compact_x1(struct xfs_dir3_icleaf_hdr *leafhdr, int *lowstalep, int *highstalep, int *lowlogp, int *highlogp);extern int xfs_dir3_leaf_get_buf (struct xfs_da_args *args,xfs_dir2_db_t bno,struct xfs_buf **bpp,__uint16_t magic); -extern void xfs_dir3_leaf_log_ents (struct xfs_trans *tp,struct xfs_buf *bp, -int first,int last); -extern void xfs_dir3_leaf_log_header (struct xfs_trans *tp, +extern void xfs_dir3_leaf_log_ents (struct xfs_trans *tp,struct xfs_inode *dp, +struct xfs_buf *bp,int first,int last); +extern void xfs_dir3_leaf_log_header (struct xfs_trans *tp,struct xfs_inode *dp,struct xfs_buf *bp);extern int xfs_dir2_leaf_lookup (struct xfs_da_args *args);extern int xfs_dir2_leaf_removename (struct xfs_da_args *args);
@@ -98,17 +98,18 @@ extern void xfs_dir3_leaf_hdr_from_disk(struct xfs_dir3_icleaf_hdr *to, struct xfs_dir2_leaf *from);extern void xfs_dir3_leaf_hdr_to_disk (struct xfs_dir2_leaf *to,struct xfs_dir3_icleaf_hdr *from); -extern bool xfs_dir3_leaf_check_int (struct xfs_mount *mp, +extern bool xfs_dir3_leaf_check_int (struct xfs_mount *mp,struct xfs_inode *dp,struct xfs_dir3_icleaf_hdr *hdr,struct xfs_dir2_leaf *leaf);/* xfs_dir2_node.c */ extern int xfs_dir2_leaf_to_node (struct xfs_da_args *args,struct xfs_buf *lbp); -extern xfs_dahash_t xfs_dir2_leafn_lasthash (struct xfs_buf *bp,int *count); +extern xfs_dahash_t xfs_dir2_leafn_lasthash (struct xfs_inode *dp, +struct xfs_buf *bp,int *count);extern int xfs_dir2_leafn_lookup_int (struct xfs_buf *bp,struct xfs_da_args *args,int *indexp,struct xfs_da_state *state); -extern int xfs_dir2_leafn_order (struct xfs_buf *leaf1_bp, +extern int xfs_dir2_leafn_order (struct xfs_inode *dp,struct xfs_buf *leaf1_bp,struct xfs_buf *leaf2_bp);extern int xfs_dir2_leafn_split (struct xfs_da_state *state,struct xfs_da_state_blk *oldblk,struct xfs_da_state_blk *newblk);
Signature · 6 lines
1.8.4.rc3 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
PATCH v2 15/19 xfs: vectorise directory leaf operations
xfs: vectorise directory leaf operations
From: Dave Chinner <[email protected]>
Next step in the vectorisation process is the leaf block encode/decode operations. Most of the operations on leaves are handled by the data block vectors, so there are relatively few of them here.
Because of all the shuffling of code and having to pass more state to some functions, this patch doesn't directly reduce the size of the binary. It does open up many more opportunities for factoring and optimisation, however.
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3 789005 96802 1096 886903 d8997 fs/xfs/xfs.o.p4 789061 96802 1096 886959 d88af fs/xfs/xfs.o.p5
---
v2: rebase to fix rejected hunk due to "\n" removal from a log message in a conflicting hunk in xfs_dir2_leafn_rebalance() from 08e96e1 ("xfs: remove newlines from strings passed to __xfs_printk")
fs/xfs/xfs_da_btree.c | 19 ++++---- fs/xfs/xfs_da_format.c | 75 +++++++++++++++++++++++++++++++ fs/xfs/xfs_da_format.h | 30 ------------- fs/xfs/xfs_dir2.c | 7 +-- fs/xfs/xfs_dir2.h | 10 +++-- fs/xfs/xfs_dir2_block.c | 2 +- fs/xfs/xfs_dir2_data.c | 13 ++---- fs/xfs/xfs_dir2_leaf.c | 91 ++++++++++++++++++++----------------- fs/xfs/xfs_dir2_node.c | 117 ++++++++++++++++++++++++++---------------------- fs/xfs/xfs_dir2_priv.h | 13 +++--- 10 files changed, 218 insertions(+), 159 deletions(-)
fs/xfs/xfs_da_btree.c +10 -9
@@ -605,7 +605,7 @@ xfs_da3_root_split( leaf = (xfs_dir2_leaf_t *)oldroot;xfs_dir3_leaf_hdr_from_disk (&leafhdr, leaf); - ents =xfs_dir3_leaf_ents_p (leaf); + ents = dp->d_ops->leaf_ents_p (leaf);ASSERT (leafhdr.magic ==XFS_DIR2_LEAFN_MAGIC || leafhdr.magic ==XFS_DIR3_LEAFN_MAGIC );
@@ -1319,7 +1319,8 @@ xfs_da3_fixhashpath(return ;break ;case XFS_DIR2_LEAFN_MAGIC : - lasthash =xfs_dir2_leafn_lasthash (blk->bp, &count); + lasthash =xfs_dir2_leafn_lasthash (state->args->dp, + blk->bp, &count);if (count ==0 )return ;break ;
@@ -1536,7 +1537,8 @@ xfs_da3_node_lookup_int(if (blk->magic ==XFS_DIR2_LEAFN_MAGIC || blk->magic ==XFS_DIR3_LEAFN_MAGIC ) { blk->magic =XFS_DIR2_LEAFN_MAGIC ; - blk->hashval =xfs_dir2_leafn_lasthash (blk->bp,NULL ); + blk->hashval =xfs_dir2_leafn_lasthash (args->dp, + blk->bp,NULL );break ; }
@@ -1702,7 +1704,7 @@ xfs_da3_blk_link( before =xfs_attr_leaf_order (old_blk->bp, new_blk->bp);break ;case XFS_DIR2_LEAFN_MAGIC : - before =xfs_dir2_leafn_order (old_blk->bp, new_blk->bp); + before =xfs_dir2_leafn_order (args->dp, old_blk->bp, new_blk->bp);break ;case XFS_DA_NODE_MAGIC : before =xfs_da3_node_order (old_blk->bp, new_blk->bp);
@@ -1947,16 +1949,15 @@ xfs_da3_path_shift( blk->magic =XFS_ATTR_LEAF_MAGIC ;ASSERT (level == path->active-1 ); blk->index =0 ; - blk->hashval =xfs_attr_leaf_lasthash (blk->bp, -NULL ); + blk->hashval =xfs_attr_leaf_lasthash (blk->bp,NULL );break ;case XFS_DIR2_LEAFN_MAGIC :case XFS_DIR3_LEAFN_MAGIC : blk->magic =XFS_DIR2_LEAFN_MAGIC ;ASSERT (level == path->active-1 ); blk->index =0 ; - blk->hashval =xfs_dir2_leafn_lasthash (blk->bp, -NULL ); + blk->hashval =xfs_dir2_leafn_lasthash (args->dp, + blk->bp,NULL );break ;default :ASSERT (0 );
@@ -2223,7 +2224,7 @@ xfs_da3_swap_lastblock( dead_leaf2 = (xfs_dir2_leaf_t *)dead_info;xfs_dir3_leaf_hdr_from_disk (&leafhdr, dead_leaf2); - ents =xfs_dir3_leaf_ents_p (dead_leaf2); + ents = ip->d_ops->leaf_ents_p (dead_leaf2); dead_level =0 ; dead_hash =be32_to_cpu (ents[leafhdr.count -1 ].hashval); }else {
fs/xfs/xfs_da_format.c +75 -0
97 lines not on this page · raw message
fs/xfs/xfs_da_format.h +0 -30
@@ -551,36 +551,6 @@ struct xfs_dir3_leaf {extern void xfs_dir3_leaf_hdr_from_disk (struct xfs_dir3_icleaf_hdr *to,struct xfs_dir2_leaf *from); -static inline int -xfs_dir3_leaf_hdr_size (struct xfs_dir2_leaf *lp) -{ -if (lp->hdr.info.magic ==cpu_to_be16 (XFS_DIR3_LEAF1_MAGIC ) || - lp->hdr.info.magic ==cpu_to_be16 (XFS_DIR3_LEAFN_MAGIC )) -return sizeof (struct xfs_dir3_leaf_hdr ); -return sizeof (struct xfs_dir2_leaf_hdr ); -} - -static inline int -xfs_dir3_max_leaf_ents (struct xfs_mount *mp,struct xfs_dir2_leaf *lp) -{ -return (mp->m_dirblksize -xfs_dir3_leaf_hdr_size (lp)) / - (uint )sizeof (struct xfs_dir2_leaf_entry ); -} - -/* -* Get address of the bestcount field in the single-leaf block. -*/ -static inline struct xfs_dir2_leaf_entry * -xfs_dir3_leaf_ents_p (struct xfs_dir2_leaf *lp) -{ -if (lp->hdr.info.magic ==cpu_to_be16 (XFS_DIR3_LEAF1_MAGIC ) || - lp->hdr.info.magic ==cpu_to_be16 (XFS_DIR3_LEAFN_MAGIC )) { -struct xfs_dir3_leaf *lp3 = (struct xfs_dir3_leaf *)lp; -return lp3->__ents; - } -return lp->__ents; -} -/* * Get address of the bestcount field in the single-leaf block. */
fs/xfs/xfs_dir2.c +1 -6
@@ -113,12 +113,7 @@ xfs_dir_mount(else mp->m_dirnameops = &xfs_default_nameops; -if (xfs_sb_version_hascrc (&mp->m_sb)) - mp->m_dir_inode_ops = &xfs_dir3_ops; -else if (xfs_sb_version_hasftype (&mp->m_sb)) - mp->m_dir_inode_ops = &xfs_dir2_ftype_ops; -else - mp->m_dir_inode_ops = &xfs_dir2_ops; + mp->m_dir_inode_ops =xfs_dir_get_ops (mp,NULL ); }/*
fs/xfs/xfs_dir2.h +7 -3
@@ -74,11 +74,15 @@ struct xfs_dir_ops { (*data_entry_p)(struct xfs_dir2_data_hdr *hdr);struct xfs_dir2_data_unused * (*data_unused_p)(struct xfs_dir2_data_hdr *hdr); + +int (*leaf_hdr_size)(void ); +int (*leaf_max_ents)(struct xfs_mount *mp); +struct xfs_dir2_leaf_entry * + (*leaf_ents_p)(struct xfs_dir2_leaf *lp); }; -extern const struct xfs_dir_ops xfs_dir2_ops; -extern const struct xfs_dir_ops xfs_dir2_ftype_ops; -extern const struct xfs_dir_ops xfs_dir3_ops; +extern const struct xfs_dir_ops * +xfs_dir_get_ops (struct xfs_mount *mp,struct xfs_inode *dp);/* * Generic directory interface routines
fs/xfs/xfs_dir2_block.c +1 -1
@@ -937,7 +937,7 @@ xfs_dir2_leaf_to_block( mp = dp->i_mount; leaf = lbp->b_addr;xfs_dir3_leaf_hdr_from_disk (&leafhdr, leaf); - ents =xfs_dir3_leaf_ents_p (leaf); + ents = dp->d_ops->leaf_ents_p (leaf); ltp =xfs_dir2_leaf_tail_p (mp, leaf); ASSERT(leafhdr.magic == XFS_DIR2_LEAF1_MAGIC ||
fs/xfs/xfs_dir2_data.c +3 -10
@@ -68,17 +68,10 @@ __xfs_dir3_data_check( hdr = bp->b_addr;/* -* we can be passed a null dp here froma verifier, so manually configure -* the ops here in that case. +* we can be passed a null dp here from a verifier, so we need to go the +* hard way to get them. */ -if (dp) - ops = dp->d_ops; -else if (xfs_sb_version_hascrc (&mp->m_sb)) - ops = &xfs_dir3_ops; -else if (xfs_sb_version_hasftype (&mp->m_sb)) - ops = &xfs_dir2_ftype_ops; -else - ops = &xfs_dir2_ops; + ops =xfs_dir_get_ops (mp, dp);switch (hdr->magic) {case cpu_to_be32 (XFS_DIR3_BLOCK_MAGIC ):
fs/xfs/xfs_dir2_leaf.c +51 -40
280 lines not on this page · raw message
fs/xfs/xfs_dir2_node.c +63 -54
347 lines not on this page · raw message
fs/xfs/xfs_dir2_priv.h +7 -6
@@ -77,9 +77,9 @@ extern void xfs_dir3_leaf_compact_x1(struct xfs_dir3_icleaf_hdr *leafhdr, int *lowstalep, int *highstalep, int *lowlogp, int *highlogp);extern int xfs_dir3_leaf_get_buf (struct xfs_da_args *args,xfs_dir2_db_t bno,struct xfs_buf **bpp,__uint16_t magic); -extern void xfs_dir3_leaf_log_ents (struct xfs_trans *tp,struct xfs_buf *bp, -int first,int last); -extern void xfs_dir3_leaf_log_header (struct xfs_trans *tp, +extern void xfs_dir3_leaf_log_ents (struct xfs_trans *tp,struct xfs_inode *dp, +struct xfs_buf *bp,int first,int last); +extern void xfs_dir3_leaf_log_header (struct xfs_trans *tp,struct xfs_inode *dp,struct xfs_buf *bp);extern int xfs_dir2_leaf_lookup (struct xfs_da_args *args);extern int xfs_dir2_leaf_removename (struct xfs_da_args *args);
@@ -98,17 +98,18 @@ extern void xfs_dir3_leaf_hdr_from_disk(struct xfs_dir3_icleaf_hdr *to, struct xfs_dir2_leaf *from);extern void xfs_dir3_leaf_hdr_to_disk (struct xfs_dir2_leaf *to,struct xfs_dir3_icleaf_hdr *from); -extern bool xfs_dir3_leaf_check_int (struct xfs_mount *mp, +extern bool xfs_dir3_leaf_check_int (struct xfs_mount *mp,struct xfs_inode *dp,struct xfs_dir3_icleaf_hdr *hdr,struct xfs_dir2_leaf *leaf);/* xfs_dir2_node.c */ extern int xfs_dir2_leaf_to_node (struct xfs_da_args *args,struct xfs_buf *lbp); -extern xfs_dahash_t xfs_dir2_leafn_lasthash (struct xfs_buf *bp,int *count); +extern xfs_dahash_t xfs_dir2_leafn_lasthash (struct xfs_inode *dp, +struct xfs_buf *bp,int *count);extern int xfs_dir2_leafn_lookup_int (struct xfs_buf *bp,struct xfs_da_args *args,int *indexp,struct xfs_da_state *state); -extern int xfs_dir2_leafn_order (struct xfs_buf *leaf1_bp, +extern int xfs_dir2_leafn_order (struct xfs_inode *dp,struct xfs_buf *leaf1_bp,struct xfs_buf *leaf2_bp);extern int xfs_dir2_leafn_split (struct xfs_da_state *state,struct xfs_da_state_blk *oldblk,struct xfs_da_state_blk *newblk);
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
PATCH v2 16/19 xfs: vectorise DA btree operations
In reply to Dave ChinnerThe remaining non-vectorised code for the directory structure is the node format blocks. This is shared with the attribute tree, and so is slightly more complex to vectorise.
Introduce a "non-directory" directory ops structure that is attached to all non-directory inodes so that attribute operations can be vectorised for all inodes.
Once we do this, we can vectorise all the da btree operations. Because this patch adds more infrastructure than it removes the binary size does not decrease:
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3 789005 96802 1096 886903 d8997 fs/xfs/xfs.o.p4 789061 96802 1096 886959 d88af fs/xfs/xfs.o.p5 789733 96802 1096 887631 d8b4f fs/xfs/xfs.o.p6
--- fs/xfs/xfs_attr_inactive.c | 3 +- fs/xfs/xfs_attr_leaf.c | 3 +- fs/xfs/xfs_attr_list.c | 11 ++--- fs/xfs/xfs_da_btree.c | 104 +++++++++++++++++++++++++-------------------- fs/xfs/xfs_da_format.c | 59 +++++++++++++++++++++++++ fs/xfs/xfs_da_format.h | 25 ----------- fs/xfs/xfs_dir2.c | 7 ++- fs/xfs/xfs_dir2.h | 6 +++ fs/xfs/xfs_iops.c | 1 + fs/xfs/xfs_mount.h | 1 + 10 files changed, 139 insertions(+), 81 deletions(-)
fs/xfs/xfs_attr_inactive.c +2 -1
@@ -40,6 +40,7 @@#include "xfs_quota.h" #include "xfs_trace.h" #include "xfs_dinode.h" +#include "xfs_dir2.h" /* * Look at all the extents for this logical region,
@@ -236,7 +237,7 @@ xfs_attr3_node_inactive(xfs_trans_brelse (*trans, bp);return 0 ; } - btree =xfs_da3_node_tree_p (node); + btree = dp->d_ops->node_tree_p (node); child_fsb =be32_to_cpu (btree[0 ].before);xfs_trans_brelse (*trans, bp);/* no locks for later trans */
fs/xfs/xfs_attr_leaf.c +2 -1
@@ -41,6 +41,7 @@#include "xfs_buf_item.h" #include "xfs_cksum.h" #include "xfs_dinode.h" +#include "xfs_dir2.h" /*
@@ -916,7 +917,7 @@ xfs_attr3_leaf_to_node( goto out; node = bp1->b_addr;xfs_da3_node_hdr_from_disk (&icnodehdr, node); - btree =xfs_da3_node_tree_p (node); + btree = dp->d_ops->node_tree_p (node); leaf = bp2->b_addr;xfs_attr3_leaf_hdr_from_disk (&icleafhdr, leaf);
fs/xfs/xfs_attr_list.c +6 -5
@@ -40,6 +40,7 @@#include "xfs_buf_item.h" #include "xfs_cksum.h" #include "xfs_dinode.h" +#include "xfs_dir2.h" STATIC intxfs_attr_shortform_compare (const void *a,const void *b)
@@ -226,6 +227,7 @@ xfs_attr_node_list(xfs_attr_list_context_t *context)struct xfs_da_node_entry *btree;int error, i;struct xfs_buf *bp; +struct xfs_inode *dp = context->dp;trace_xfs_attr_node_list (context);
@@ -239,7 +241,7 @@ xfs_attr_node_list(xfs_attr_list_context_t *context)*/ bp =NULL ;if (cursor->blkno >0 ) { - error =xfs_da3_node_read (NULL , context->dp, cursor->blkno,-1 , + error =xfs_da3_node_read (NULL , dp, cursor->blkno,-1 , &bp,XFS_ATTR_FORK );if ((error !=0 ) && (error !=EFSCORRUPTED ))return (error);
@@ -289,7 +291,7 @@ xfs_attr_node_list(xfs_attr_list_context_t *context)for (;;) {__uint16_t magic; - error =xfs_da3_node_read (NULL , context->dp, + error =xfs_da3_node_read (NULL , dp, cursor->blkno,-1 , &bp,XFS_ATTR_FORK );if (error)
@@ -310,7 +312,7 @@ xfs_attr_node_list(xfs_attr_list_context_t *context) }xfs_da3_node_hdr_from_disk (&nodehdr, node); - btree =xfs_da3_node_tree_p (node); + btree = dp->d_ops->node_tree_p (node);for (i =0 ; i < nodehdr.count; btree++, i++) {if (cursor->hashval <=be32_to_cpu (btree->hashval)) {
@@ -346,8 +348,7 @@ xfs_attr_node_list(xfs_attr_list_context_t *context)break ; cursor->blkno = leafhdr.forw;xfs_trans_brelse (NULL , bp); - error =xfs_attr3_leaf_read (NULL , context->dp, cursor->blkno,-1 , - &bp); + error =xfs_attr3_leaf_read (NULL , dp, cursor->blkno,-1 , &bp);if (error)return error; }
fs/xfs/xfs_da_btree.c +57 -47
392 lines not on this page · raw message
fs/xfs/xfs_da_format.c +59 -0
86 lines not on this page · raw message
fs/xfs/xfs_da_format.h +0 -25
@@ -127,31 +127,6 @@ extern void xfs_da3_node_hdr_from_disk(struct xfs_da3_icnode_hdr *to,extern void xfs_da3_node_hdr_to_disk (struct xfs_da_intnode *to,struct xfs_da3_icnode_hdr *from); -static inline int -__xfs_da3_node_hdr_size (bool v3) -{ -if (v3) -return sizeof (struct xfs_da3_node_hdr ); -return sizeof (struct xfs_da_node_hdr ); -} -static inline int -xfs_da3_node_hdr_size (struct xfs_da_intnode *dap) -{ -bool v3 = dap->hdr.info.magic ==cpu_to_be16 (XFS_DA3_NODE_MAGIC ); - -return __xfs_da3_node_hdr_size (v3); -} - -static inline struct xfs_da_node_entry * -xfs_da3_node_tree_p (struct xfs_da_intnode *dap) -{ -if (dap->hdr.info.magic ==cpu_to_be16 (XFS_DA3_NODE_MAGIC )) { -struct xfs_da3_intnode *dap3 = (struct xfs_da3_intnode *)dap; -return dap3->__btree; - } -return dap->__btree; -} -extern void xfs_da3_intnode_from_disk (struct xfs_da3_icnode_hdr *to,struct xfs_da_intnode *from); extern void xfs_da3_intnode_to_disk(struct xfs_da_intnode *to,
fs/xfs/xfs_dir2.c +5 -2
@@ -95,13 +95,17 @@ xfs_dir_mount(ASSERT (xfs_sb_version_hasdirv2 (&mp->m_sb));ASSERT ((1 << (mp->m_sb.sb_blocklog + mp->m_sb.sb_dirblklog)) <=XFS_MAX_BLOCKSIZE ); + + mp->m_dir_inode_ops =xfs_dir_get_ops (mp,NULL ); + mp->m_nondir_inode_ops =xfs_nondir_get_ops (mp,NULL ); + mp->m_dirblksize =1 << (mp->m_sb.sb_blocklog + mp->m_sb.sb_dirblklog); mp->m_dirblkfsbs =1 << mp->m_sb.sb_dirblklog; mp->m_dirdatablk =xfs_dir2_db_to_da (mp,XFS_DIR2_DATA_FIRSTDB (mp)); mp->m_dirleafblk =xfs_dir2_db_to_da (mp,XFS_DIR2_LEAF_FIRSTDB (mp)); mp->m_dirfreeblk =xfs_dir2_db_to_da (mp,XFS_DIR2_FREE_FIRSTDB (mp)); - nodehdr_size =__xfs_da3_node_hdr_size (xfs_sb_version_hascrc (&mp->m_sb)); + nodehdr_size = mp->m_dir_inode_ops->node_hdr_size (); mp->m_attr_node_ents = (mp->m_sb.sb_blocksize - nodehdr_size) / (uint )sizeof (xfs_da_node_entry_t); mp->m_dir_node_ents = (mp->m_dirblksize - nodehdr_size) /
@@ -113,7 +117,6 @@ xfs_dir_mount(else mp->m_dirnameops = &xfs_default_nameops; - mp->m_dir_inode_ops =xfs_dir_get_ops (mp,NULL ); }/*
fs/xfs/xfs_dir2.h +6 -0
@@ -79,10 +79,16 @@ struct xfs_dir_ops {int (*leaf_max_ents)(struct xfs_mount *mp);struct xfs_dir2_leaf_entry * (*leaf_ents_p)(struct xfs_dir2_leaf *lp); + +int (*node_hdr_size)(void ); +struct xfs_da_node_entry * + (*node_tree_p)(struct xfs_da_intnode *dap); };extern const struct xfs_dir_ops *xfs_dir_get_ops (struct xfs_mount *mp,struct xfs_inode *dp); +extern const struct xfs_dir_ops * +xfs_nondir_get_ops (struct xfs_mount *mp,struct xfs_inode *dp);/* * Generic directory interface routines
fs/xfs/xfs_iops.c +1 -0
@@ -1200,6 +1200,7 @@ xfs_setup_inode( inode->i_ctime.tv_nsec = ip->i_d.di_ctime.t_nsec;xfs_diflags_to_iflags (inode, ip); + ip->d_ops = ip->i_mount->m_nondir_inode_ops;switch (inode->i_mode &S_IFMT ) {case S_IFREG : inode->i_op = &xfs_inode_operations;
fs/xfs/xfs_mount.h +1 -0
@@ -150,6 +150,7 @@ typedef struct xfs_mount {__uint8_t m_sectbb_log;/* sectlog - BBSHIFT */ const struct xfs_nameops *m_dirnameops;/* vector of dir name ops */ const struct xfs_dir_ops *m_dir_inode_ops;/* vector of dir inode ops */ +const struct xfs_dir_ops *m_nondir_inode_ops;/* !dir inode ops */ int m_dirblksize;/* directory block sz--bytes */ int m_dirblkfsbs;/* directory block sz--fsbs */ xfs_dablk_t m_dirdatablk;/* blockno of dir data v2 */
Signature · 6 lines
1.8.4.rc3 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 16/19] xfs: vectorise DA btree operations
Quoted 21 lines · Dave Chinner
The remaining non-vectorised code for the directory structure is the node format blocks. This is shared with the attribute tree, and so is slightly more complex to vectorise.
Introduce a "non-directory" directory ops structure that is attached to all non-directory inodes so that attribute operations can be vectorised for all inodes.
Once we do this, we can vectorise all the da btree operations. Because this patch adds more infrastructure than it removes the binary size does not decrease:
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3 789005 96802 1096 886903 d8997 fs/xfs/xfs.o.p4 789061 96802 1096 886959 d88af fs/xfs/xfs.o.p5 789733 96802 1096 887631 d8b4f fs/xfs/xfs.o.p6
Quoted 1 line
Signed-off-by Dave Chinner <[email protected]>
Looks good.
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
PATCH v2 17/19 xfs: vectorise encoding/decoding directory headers
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Conversion from on-disk structures to in-core header structures currently relies on magic number checks. If the magic number is wrong, but one of the supported values, we do the wrong thing with the encode/decode operation. Split these functions so that there are discrete operations for the specific directory format we are handling.
In doing this, move all the header encode/decode functions to xfs_da_format.c as they are directly manipulating the on-disk format. It should be noted that all the growth in binary size is from xfs_da_format.c - the rest of the code actaully shrinks.
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3 789005 96802 1096 886903 d8997 fs/xfs/xfs.o.p4 789061 96802 1096 886959 d88af fs/xfs/xfs.o.p5 789733 96802 1096 887631 d8b4f fs/xfs/xfs.o.p6 791421 96802 1096 889319 d91e7 fs/xfs/xfs.o.p7
--- fs/xfs/xfs_attr_inactive.c | 2 +- fs/xfs/xfs_attr_leaf.c | 4 +- fs/xfs/xfs_attr_list.c | 2 +- fs/xfs/xfs_da_btree.c | 141 +++++++++++-------------------- fs/xfs/xfs_da_format.c | 206 ++++++++++++++++++++++++++++++++++++++++++++- fs/xfs/xfs_da_format.h | 16 ---- fs/xfs/xfs_dir2.h | 13 +++ fs/xfs/xfs_dir2_block.c | 2 +- fs/xfs/xfs_dir2_leaf.c | 100 ++++++---------------- fs/xfs/xfs_dir2_node.c | 126 +++++++++------------------ fs/xfs/xfs_dir2_priv.h | 4 - 11 files changed, 335 insertions(+), 281 deletions(-)
fs/xfs/xfs_attr_inactive.c +1 -1
@@ -231,7 +231,7 @@ xfs_attr3_node_inactive( } node = bp->b_addr; -xfs_da3_node_hdr_from_disk (&ichdr, node); + dp->d_ops->node_hdr_from_disk (&ichdr, node); parent_blkno = bp->b_bn;if (!ichdr.count) {xfs_trans_brelse (*trans, bp);
fs/xfs/xfs_attr_leaf.c +2 -2
@@ -916,7 +916,7 @@ xfs_attr3_leaf_to_node(if (error) goto out; node = bp1->b_addr; -xfs_da3_node_hdr_from_disk (&icnodehdr, node); + dp->d_ops->node_hdr_from_disk (&icnodehdr, node); btree = dp->d_ops->node_tree_p (node); leaf = bp2->b_addr;
@@ -927,7 +927,7 @@ xfs_attr3_leaf_to_node( btree[0 ].hashval = entries[icleafhdr.count -1 ].hashval; btree[0 ].before =cpu_to_be32 (blkno); icnodehdr.count =1 ; -xfs_da3_node_hdr_to_disk (node, &icnodehdr); + dp->d_ops->node_hdr_to_disk (node, &icnodehdr);xfs_trans_log_buf (args->trans, bp1,0 ,XFS_LBSIZE (mp) -1 ); error =0 ; out:
fs/xfs/xfs_attr_list.c +1 -1
@@ -311,7 +311,7 @@ xfs_attr_node_list(xfs_attr_list_context_t *context)return XFS_ERROR (EFSCORRUPTED ); } -xfs_da3_node_hdr_from_disk (&nodehdr, node); + dp->d_ops->node_hdr_from_disk (&nodehdr, node); btree = dp->d_ops->node_tree_p (node);for (i =0 ; i < nodehdr.count; btree++, i++) { if (cursor->hashval
fs/xfs/xfs_da_btree.c +49 -92
379 lines not on this page · raw message
fs/xfs/xfs_da_format.c +204 -2
270 lines not on this page · raw message
fs/xfs/xfs_da_format.h +0 -16
@@ -122,16 +122,6 @@ struct xfs_da3_icnode_hdr {__uint16_t level; }; -extern void xfs_da3_node_hdr_from_disk (struct xfs_da3_icnode_hdr *to, -struct xfs_da_intnode *from); -extern void xfs_da3_node_hdr_to_disk (struct xfs_da_intnode *to, -struct xfs_da3_icnode_hdr *from); - -extern void xfs_da3_intnode_from_disk (struct xfs_da3_icnode_hdr *to, -struct xfs_da_intnode *from); -extern void xfs_da3_intnode_to_disk (struct xfs_da_intnode *to, -struct xfs_da3_icnode_hdr *from); -#define XFS_LBSIZE (mp) (mp)->m_sb.sb_blocksize/*
@@ -523,9 +513,6 @@ struct xfs_dir3_leaf {#define XFS_DIR3_LEAF_CRC_OFF offsetof(struct xfs_dir3_leaf_hdr, info.crc) -extern void xfs_dir3_leaf_hdr_from_disk (struct xfs_dir3_icleaf_hdr *to, -struct xfs_dir2_leaf *from); -/* * Get address of the bestcount field in the single-leaf block. */
@@ -717,9 +704,6 @@ struct xfs_dir3_icfree_hdr { }; -void xfs_dir3_free_hdr_from_disk (struct xfs_dir3_icfree_hdr *to, -struct xfs_dir2_free *from); -static inline int xfs_dir3_free_hdr_size (struct xfs_mount *mp) {
fs/xfs/xfs_dir2.h +13 -0
@@ -76,13 +76,26 @@ struct xfs_dir_ops { (*data_unused_p)(struct xfs_dir2_data_hdr *hdr);int (*leaf_hdr_size)(void ); +void (*leaf_hdr_to_disk)(struct xfs_dir2_leaf *to, +struct xfs_dir3_icleaf_hdr *from); +void (*leaf_hdr_from_disk)(struct xfs_dir3_icleaf_hdr *to, +struct xfs_dir2_leaf *from);int (*leaf_max_ents)(struct xfs_mount *mp);struct xfs_dir2_leaf_entry * (*leaf_ents_p)(struct xfs_dir2_leaf *lp);int (*node_hdr_size)(void ); +void (*node_hdr_to_disk)(struct xfs_da_intnode *to, +struct xfs_da3_icnode_hdr *from); +void (*node_hdr_from_disk)(struct xfs_da3_icnode_hdr *to, +struct xfs_da_intnode *from);struct xfs_da_node_entry * (*node_tree_p)(struct xfs_da_intnode *dap); + +void (*free_hdr_to_disk)(struct xfs_dir2_free *to, +struct xfs_dir3_icfree_hdr *from); +void (*free_hdr_from_disk)(struct xfs_dir3_icfree_hdr *to, +struct xfs_dir2_free *from); }; extern const struct xfs_dir_ops *
fs/xfs/xfs_dir2_block.c +1 -1
@@ -936,7 +936,7 @@ xfs_dir2_leaf_to_block( tp = args->trans; mp = dp->i_mount; leaf = lbp->b_addr; -xfs_dir3_leaf_hdr_from_disk (&leafhdr, leaf); + dp->d_ops->leaf_hdr_from_disk (&leafhdr, leaf); ents = dp->d_ops->leaf_ents_p (leaf); ltp =xfs_dir2_leaf_tail_p (mp, leaf);
fs/xfs/xfs_dir2_leaf.c +24 -76
217 lines not on this page · raw message
fs/xfs/xfs_dir2_node.c +40 -86
317 lines not on this page · raw message
fs/xfs/xfs_dir2_priv.h +0 -4
@@ -94,10 +94,6 @@ xfs_dir3_leaf_find_entry(struct xfs_dir3_icleaf_hdr *leafhdr, int lowstale, int highstale, int *lfloglow, int *lfloghigh);extern int xfs_dir2_node_to_leaf (struct xfs_da_state *state); -extern void xfs_dir3_leaf_hdr_from_disk (struct xfs_dir3_icleaf_hdr *to, -struct xfs_dir2_leaf *from); -extern void xfs_dir3_leaf_hdr_to_disk (struct xfs_dir2_leaf *to, -struct xfs_dir3_icleaf_hdr *from);extern bool xfs_dir3_leaf_check_int (struct xfs_mount *mp,struct xfs_inode *dp,struct xfs_dir3_icleaf_hdr *hdr,struct xfs_dir2_leaf *leaf);
Signature · 6 lines
1.8.4.rc3 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 17/19] xfs: vectorise encoding/decoding directory headers
Quoted 34 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Conversion from on-disk structures to in-core header structures currently relies on magic number checks. If the magic number is wrong, but one of the supported values, we do the wrong thing with the encode/decode operation. Split these functions so that there are discrete operations for the specific directory format we are handling.
In doing this, move all the header encode/decode functions to
xfs_da_format.cas they are directly manipulating the on-disk format. It should be noted that all the growth in binary size is fromxfs_da_format.c- the rest of the code actaully shrinks.text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3 789005 96802 1096 886903 d8997 fs/xfs/xfs.o.p4 789061 96802 1096 886959 d88af fs/xfs/xfs.o.p5 789733 96802 1096 887631 d8b4f fs/xfs/xfs.o.p6 791421 96802 1096 889319 d91e7 fs/xfs/xfs.o.p7Signed-off-by Dave Chinner <[email protected]>const struct
xfs_dir_opsxfs_dir2_ops= {fs/xfs/xfs_da_format.c +0
-0.sf_entsize = xfs_dir2_sf_entsize, .sf_nextentry = xfs_dir2_sf_nextentry,@@ -532,10 +712,14 @@ const struct xfs_dir_ops xfs_dir2_ops = { .data_unused_p = xfs_dir2_data_unused_p,
fs/xfs/xfs_da_format.c const struct xfs_dir_ops xfs_dir2_ops = { · line 723
Quoted 10 lines
fs/xfs/xfs_da_format.c +4
-0.leaf_hdr_size = xfs_dir2_leaf_hdr_size, + .leaf_hdr_to_disk = xfs_dir2_leaf_hdr_to_disk, + .leaf_hdr_from_disk = xfs_dir2_leaf_hdr_from_disk, .leaf_max_ents = xfs_dir2_max_leaf_ents, .leaf_ents_p = xfs_dir2_leaf_ents_p, .node_hdr_size = xfs_da2_node_hdr_size, + .node_hdr_to_disk = xfs_da2_node_hdr_to_disk, + .node_hdr_from_disk = xfs_da2_node_hdr_from_disk, .node_tree_p = xfs_da2_node_tree_p,
.free_hdr_to_disk = xfs_dir2_free_hdr_to_disk, .free_hdr_from_disk = xfs_dir2_free_hdr_from_disk,
Is this missing?
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Ben Myers
Reviewed-byRe: [PATCH 17/19] xfs: vectorise encoding/decoding directory headers
Quoted 49 lines · Ben Myers
Quoted 34 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Conversion from on-disk structures to in-core header structures currently relies on magic number checks. If the magic number is wrong, but one of the supported values, we do the wrong thing with the encode/decode operation. Split these functions so that there are discrete operations for the specific directory format we are handling.
In doing this, move all the header encode/decode functions to
xfs_da_format.cas they are directly manipulating the on-disk format. It should be noted that all the growth in binary size is fromxfs_da_format.c- the rest of the code actaully shrinks.text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3 789005 96802 1096 886903 d8997 fs/xfs/xfs.o.p4 789061 96802 1096 886959 d88af fs/xfs/xfs.o.p5 789733 96802 1096 887631 d8b4f fs/xfs/xfs.o.p6 791421 96802 1096 889319 d91e7 fs/xfs/xfs.o.p7Signed-off-by Dave Chinner <[email protected]>const struct
xfs_dir_opsxfs_dir2_ops= {fs/xfs/xfs_da_format.c +0
-0.sf_entsize = xfs_dir2_sf_entsize, .sf_nextentry = xfs_dir2_sf_nextentry,@@ -532,10 +712,14 @@ const struct xfs_dir_ops xfs_dir2_ops = { .data_unused_p = xfs_dir2_data_unused_p,fs/xfs/xfs_da_format.c const struct xfs_dir_ops xfs_dir2_ops = { · line 723
Quoted 10 lines
fs/xfs/xfs_da_format.c +4
-0.leaf_hdr_size = xfs_dir2_leaf_hdr_size, + .leaf_hdr_to_disk = xfs_dir2_leaf_hdr_to_disk, + .leaf_hdr_from_disk = xfs_dir2_leaf_hdr_from_disk, .leaf_max_ents = xfs_dir2_max_leaf_ents, .leaf_ents_p = xfs_dir2_leaf_ents_p, .node_hdr_size = xfs_da2_node_hdr_size, + .node_hdr_to_disk = xfs_da2_node_hdr_to_disk, + .node_hdr_from_disk = xfs_da2_node_hdr_from_disk, .node_tree_p = xfs_da2_node_tree_p,.free_hdr_to_disk = xfs_dir2_free_hdr_to_disk, .free_hdr_from_disk = xfs_dir2_free_hdr_from_disk,
Quoted 1 line
Is this missing?
Ah. Looks like it snuck into the next patch.
Other than that it looks good.
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
PATCH v2 18/19 xfs: vectorise directory leaf operations
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Next step in the vectorisation process is the directory free block encode/decode operations. There are relatively few of these, though there are quite a numberof calls to them.
Binary sizes:
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3 789005 96802 1096 886903 d8997 fs/xfs/xfs.o.p4 789061 96802 1096 886959 d88af fs/xfs/xfs.o.p5 789733 96802 1096 887631 d8b4f fs/xfs/xfs.o.p6 791421 96802 1096 889319 d91e7 fs/xfs/xfs.o.p7 791701 96802 1096 889599 d92ff fs/xfs/xfs.o.p8
--- fs/xfs/xfs_da_format.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++ fs/xfs/xfs_da_format.h | 39 --------------------- fs/xfs/xfs_dir2.h | 5 +++ fs/xfs/xfs_dir2_leaf.c | 2 +- fs/xfs/xfs_dir2_node.c | 61 +++++++++++++++++---------------- 5 files changed, 129 insertions(+), 70 deletions(-)
fs/xfs/xfs_da_format.c +92 -0
@@ -629,6 +629,80 @@ xfs_da3_node_hdr_to_disk(/* * Directory free space block operations */ +static int +xfs_dir2_free_hdr_size (void ) +{ +return sizeof (struct xfs_dir2_free_hdr ); +} + +static int +xfs_dir2_free_max_bests (struct xfs_mount *mp) +{ +return (mp->m_dirblksize -xfs_dir2_free_hdr_size ()) / +sizeof (xfs_dir2_data_off_t); +} + +static __be16 * +xfs_dir2_free_bests_p (struct xfs_dir2_free *free) +{ +return (__be16 *)((char *)free +xfs_dir2_free_hdr_size ()); +} + +/* +* Convert data space db to the corresponding free db. +*/ +static xfs_dir2_db_t +xfs_dir2_db_to_fdb (struct xfs_mount *mp,xfs_dir2_db_t db) +{ +return XFS_DIR2_FREE_FIRSTDB (mp) + db /xfs_dir2_free_max_bests (mp); +} + +/* +* Convert data space db to the corresponding index in a free db. +*/ +static int +xfs_dir2_db_to_fdindex (struct xfs_mount *mp,xfs_dir2_db_t db) +{ +return db %xfs_dir2_free_max_bests (mp); +} + +static int +xfs_dir3_free_hdr_size (void ) +{ +return sizeof (struct xfs_dir3_free_hdr ); +} + +static int +xfs_dir3_free_max_bests (struct xfs_mount *mp) +{ +return (mp->m_dirblksize -xfs_dir3_free_hdr_size ()) / +sizeof (xfs_dir2_data_off_t); +} + +static __be16 * +xfs_dir3_free_bests_p (struct xfs_dir2_free *free) +{ +return (__be16 *)((char *)free +xfs_dir3_free_hdr_size ()); +} + +/* +* Convert data space db to the corresponding free db. +*/ +static xfs_dir2_db_t +xfs_dir3_db_to_fdb (struct xfs_mount *mp,xfs_dir2_db_t db) +{ +return XFS_DIR2_FREE_FIRSTDB (mp) + db /xfs_dir3_free_max_bests (mp); +} + +/* +* Convert data space db to the corresponding index in a free db. +*/ +static int +xfs_dir3_db_to_fdindex (struct xfs_mount *mp,xfs_dir2_db_t db) +{ +return db %xfs_dir3_free_max_bests (mp); +} + static void xfs_dir2_free_hdr_from_disk( struct xfs_dir3_icfree_hdr *to,
@@ -721,6 +795,14 @@ const struct xfs_dir_ops xfs_dir2_ops = { .node_hdr_to_disk = xfs_da2_node_hdr_to_disk, .node_hdr_from_disk = xfs_da2_node_hdr_from_disk, .node_tree_p = xfs_da2_node_tree_p, + + .free_hdr_size = xfs_dir2_free_hdr_size, + .free_hdr_to_disk = xfs_dir2_free_hdr_to_disk, + .free_hdr_from_disk = xfs_dir2_free_hdr_from_disk, + .free_max_bests = xfs_dir2_free_max_bests, + .free_bests_p = xfs_dir2_free_bests_p, + .db_to_fdb = xfs_dir2_db_to_fdb, + .db_to_fdindex = xfs_dir2_db_to_fdindex, };const struct xfs_dir_ops xfs_dir2_ftype_ops = {
@@ -761,8 +843,13 @@ const struct xfs_dir_ops xfs_dir2_ftype_ops = { .node_hdr_from_disk = xfs_da2_node_hdr_from_disk, .node_tree_p = xfs_da2_node_tree_p, + .free_hdr_size = xfs_dir2_free_hdr_size, .free_hdr_to_disk = xfs_dir2_free_hdr_to_disk, .free_hdr_from_disk = xfs_dir2_free_hdr_from_disk, + .free_max_bests = xfs_dir2_free_max_bests, + .free_bests_p = xfs_dir2_free_bests_p, + .db_to_fdb = xfs_dir2_db_to_fdb, + .db_to_fdindex = xfs_dir2_db_to_fdindex, };const struct xfs_dir_ops xfs_dir3_ops = {
@@ -803,8 +890,13 @@ const struct xfs_dir_ops xfs_dir3_ops = { .node_hdr_from_disk = xfs_da3_node_hdr_from_disk, .node_tree_p = xfs_da3_node_tree_p, + .free_hdr_size = xfs_dir3_free_hdr_size, .free_hdr_to_disk = xfs_dir3_free_hdr_to_disk, .free_hdr_from_disk = xfs_dir3_free_hdr_from_disk, + .free_max_bests = xfs_dir2_free_max_bests, + .free_bests_p = xfs_dir3_free_bests_p, + .db_to_fdb = xfs_dir3_db_to_fdb, + .db_to_fdindex = xfs_dir3_db_to_fdindex, };const struct xfs_dir_ops xfs_dir2_nondir_ops = {
fs/xfs/xfs_da_format.h +0 -39
@@ -704,45 +704,6 @@ struct xfs_dir3_icfree_hdr { }; -static inline int -xfs_dir3_free_hdr_size (struct xfs_mount *mp) -{ -if (xfs_sb_version_hascrc (&mp->m_sb)) -return sizeof (struct xfs_dir3_free_hdr ); -return sizeof (struct xfs_dir2_free_hdr ); -} - -static inline int -xfs_dir3_free_max_bests (struct xfs_mount *mp) -{ -return (mp->m_dirblksize -xfs_dir3_free_hdr_size (mp)) / -sizeof (xfs_dir2_data_off_t); -} - -static inline __be16 * -xfs_dir3_free_bests_p (struct xfs_mount *mp,struct xfs_dir2_free *free) -{ -return (__be16 *)((char *)free +xfs_dir3_free_hdr_size (mp)); -} - -/* -* Convert data space db to the corresponding free db. -*/ -static inline xfs_dir2_db_t -xfs_dir2_db_to_fdb (struct xfs_mount *mp,xfs_dir2_db_t db) -{ -return XFS_DIR2_FREE_FIRSTDB (mp) + db /xfs_dir3_free_max_bests (mp); -} - -/* -* Convert data space db to the corresponding index in a free db. -*/ -static inline int -xfs_dir2_db_to_fdindex (struct xfs_mount *mp,xfs_dir2_db_t db) -{ -return db %xfs_dir3_free_max_bests (mp); -} -/* * Single block format. *
fs/xfs/xfs_dir2.h +5 -0
@@ -92,10 +92,15 @@ struct xfs_dir_ops {struct xfs_da_node_entry * (*node_tree_p)(struct xfs_da_intnode *dap); +int (*free_hdr_size)(void );void (*free_hdr_to_disk)(struct xfs_dir2_free *to,struct xfs_dir3_icfree_hdr *from);void (*free_hdr_from_disk)(struct xfs_dir3_icfree_hdr *to,struct xfs_dir2_free *from); +int (*free_max_bests)(struct xfs_mount *mp); +__be16 * (*free_bests_p)(struct xfs_dir2_free *free); +xfs_dir2_db_t (*db_to_fdb)(struct xfs_mount *mp,xfs_dir2_db_t db); +int (*db_to_fdindex)(struct xfs_mount *mp,xfs_dir2_db_t db); }; extern const struct xfs_dir_ops *
fs/xfs/xfs_dir2_leaf.c +1 -1
@@ -1785,7 +1785,7 @@ xfs_dir2_node_to_leaf(/* * Set up the leaf bests table. */ -memcpy (xfs_dir2_leaf_bests_p (ltp),xfs_dir3_free_bests_p (mp, free), +memcpy (xfs_dir2_leaf_bests_p (ltp), dp->d_ops->free_bests_p (free), freehdr.nvalid *sizeof (xfs_dir2_data_off_t)); dp->d_ops->leaf_hdr_to_disk (leaf, &leafhdr);
fs/xfs/xfs_dir2_node.c +31 -30
231 lines not on this page · raw message
Signature · 6 lines
1.8.4.rc3 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 18/19] xfs: vectorise directory leaf operations
Quoted 19 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Next step in the vectorisation process is the directory free block encode/decode operations. There are relatively few of these, though there are quite a numberof calls to them.
Binary sizes:
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3 789005 96802 1096 886903 d8997 fs/xfs/xfs.o.p4 789061 96802 1096 886959 d88af fs/xfs/xfs.o.p5 789733 96802 1096 887631 d8b4f fs/xfs/xfs.o.p6 791421 96802 1096 889319 d91e7 fs/xfs/xfs.o.p7 791701 96802 1096 889599 d92ff fs/xfs/xfs.o.p8
Quoted 1 line
Signed-off-by Dave Chinner <[email protected]>
Looks good except for the two lines that snuck in from the previous patch.
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 18/19] xfs: vectorise directory leaf operations
In reply to Dave ChinnerQuoted 143 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Next step in the vectorisation process is the directory free block encode/decode operations. There are relatively few of these, though there are quite a numberof calls to them.
Binary sizes:
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3 789005 96802 1096 886903 d8997 fs/xfs/xfs.o.p4 789061 96802 1096 886959 d88af fs/xfs/xfs.o.p5 789733 96802 1096 887631 d8b4f fs/xfs/xfs.o.p6 791421 96802 1096 889319 d91e7 fs/xfs/xfs.o.p7 791701 96802 1096 889599 d92ff fs/xfs/xfs.o.p8Signed-off-by Dave Chinner <[email protected]>--- fs/xfs/xfs_da_format.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++ fs/xfs/xfs_da_format.h | 39 --------------------- fs/xfs/xfs_dir2.h | 5 +++ fs/xfs/xfs_dir2_leaf.c | 2 +- fs/xfs/xfs_dir2_node.c | 61 +++++++++++++++++---------------- 5 files changed, 129 insertions(+), 70 deletions(-)fs/xfs/xfs_da_format.c +87
-0@@ -629,6 +629,80 @@ xfs_da3_node_hdr_to_disk(/* * Directory free space block operations */ +static int +xfs_dir2_free_hdr_size (void ) +{ +return sizeof (struct xfs_dir2_free_hdr ); +} + +static int +xfs_dir2_free_max_bests (struct xfs_mount *mp) +{ +return (mp->m_dirblksize -xfs_dir2_free_hdr_size ()) / +sizeof (xfs_dir2_data_off_t); +} + +static __be16 * +xfs_dir2_free_bests_p (struct xfs_dir2_free *free) +{ +return (__be16 *)((char *)free +xfs_dir2_free_hdr_size ()); +} + +/* +* Convert data space db to the corresponding free db. +*/ +static xfs_dir2_db_t +xfs_dir2_db_to_fdb (struct xfs_mount *mp,xfs_dir2_db_t db) +{ +return XFS_DIR2_FREE_FIRSTDB (mp) + db /xfs_dir2_free_max_bests (mp); +} + +/* +* Convert data space db to the corresponding index in a free db. +*/ +static int +xfs_dir2_db_to_fdindex (struct xfs_mount *mp,xfs_dir2_db_t db) +{ +return db %xfs_dir2_free_max_bests (mp); +} + +static int +xfs_dir3_free_hdr_size (void ) +{ +return sizeof (struct xfs_dir3_free_hdr ); +} + +static int +xfs_dir3_free_max_bests (struct xfs_mount *mp) +{ +return (mp->m_dirblksize -xfs_dir3_free_hdr_size ()) / +sizeof (xfs_dir2_data_off_t); +} + +static __be16 * +xfs_dir3_free_bests_p (struct xfs_dir2_free *free) +{ +return (__be16 *)((char *)free +xfs_dir3_free_hdr_size ()); +} + +/* +* Convert data space db to the corresponding free db. +*/ +static xfs_dir2_db_t +xfs_dir3_db_to_fdb (struct xfs_mount *mp,xfs_dir2_db_t db) +{ +return XFS_DIR2_FREE_FIRSTDB (mp) + db /xfs_dir3_free_max_bests (mp); +} + +/* +* Convert data space db to the corresponding index in a free db. +*/ +static int +xfs_dir3_db_to_fdindex (struct xfs_mount *mp,xfs_dir2_db_t db) +{ +return db %xfs_dir3_free_max_bests (mp); +} + static void xfs_dir2_free_hdr_from_disk( struct xfs_dir3_icfree_hdr *to,@@ -721,6 +795,14 @@ const struct xfs_dir_ops xfs_dir2_ops = { .node_hdr_to_disk = xfs_da2_node_hdr_to_disk, .node_hdr_from_disk = xfs_da2_node_hdr_from_disk, .node_tree_p = xfs_da2_node_tree_p, + + .free_hdr_size = xfs_dir2_free_hdr_size, + .free_hdr_to_disk = xfs_dir2_free_hdr_to_disk, + .free_hdr_from_disk = xfs_dir2_free_hdr_from_disk, + .free_max_bests = xfs_dir2_free_max_bests, + .free_bests_p = xfs_dir2_free_bests_p, + .db_to_fdb = xfs_dir2_db_to_fdb, + .db_to_fdindex = xfs_dir2_db_to_fdindex, };const struct xfs_dir_ops xfs_dir2_ftype_ops = {@@ -761,8 +843,13 @@ const struct xfs_dir_ops xfs_dir2_ftype_ops = { .node_hdr_from_disk = xfs_da2_node_hdr_from_disk, .node_tree_p = xfs_da2_node_tree_p, + .free_hdr_size = xfs_dir2_free_hdr_size, .free_hdr_to_disk = xfs_dir2_free_hdr_to_disk, .free_hdr_from_disk = xfs_dir2_free_hdr_from_disk, + .free_max_bests = xfs_dir2_free_max_bests, + .free_bests_p = xfs_dir2_free_bests_p, + .db_to_fdb = xfs_dir2_db_to_fdb, + .db_to_fdindex = xfs_dir2_db_to_fdindex, };const struct xfs_dir_ops xfs_dir3_ops = {
fs/xfs/xfs_da_format.c const struct xfs_dir_ops xfs_dir3_ops = { · line 896
Quoted 7 lines
fs/xfs/xfs_da_format.c +2
-0@@ -803,8 +890,13 @@ const struct xfs_dir_ops xfs_dir3_ops = { .node_hdr_from_disk = xfs_da3_node_hdr_from_disk, .node_tree_p = xfs_da3_node_tree_p, + .free_hdr_size = xfs_dir3_free_hdr_size, .free_hdr_to_disk = xfs_dir3_free_hdr_to_disk, .free_hdr_from_disk = xfs_dir3_free_hdr_from_disk, + .free_max_bests = xfs_dir2_free_max_bests,
^^^^^^^^^^^^^^^^^^^^^^^
Looks like here is where the dir2_free_max_bests issue crept in.
-Ben
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
PATCH v2 19/19 xfs: convert directory vector functions to constants
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Many of the vectorised function calls now take no parameters and return a constant value. There is no reason for these to be vectored functions, so convert them to constants
Binary sizes:
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3 789005 96802 1096 886903 d8997 fs/xfs/xfs.o.p4 789061 96802 1096 886959 d88af fs/xfs/xfs.o.p5 789733 96802 1096 887631 d8b4f fs/xfs/xfs.o.p6 791421 96802 1096 889319 d91e7 fs/xfs/xfs.o.p7 791701 96802 1096 889599 d92ff fs/xfs/xfs.o.p8 791205 96802 1096 889103 d91cf fs/xfs/xfs.o.p9
--- fs/xfs/xfs_da_btree.c | 14 ++- fs/xfs/xfs_da_format.c | 222 +++++++++++++++++----------------------------- fs/xfs/xfs_dir2.c | 2 +- fs/xfs/xfs_dir2.h | 14 +-- fs/xfs/xfs_dir2_block.c | 4 +- fs/xfs/xfs_dir2_data.c | 8 +- fs/xfs/xfs_dir2_leaf.c | 6 +- fs/xfs/xfs_dir2_node.c | 8 +- fs/xfs/xfs_dir2_readdir.c | 6 +- fs/xfs/xfs_dir2_sf.c | 6 +- 10 files changed, 113 insertions(+), 177 deletions(-)
fs/xfs/xfs_da_btree.c +6 -8
@@ -333,8 +333,7 @@ xfs_da3_node_create( dp->d_ops->node_hdr_to_disk (node, &ichdr);xfs_trans_log_buf (tp, bp, -XFS_DA_LOGRANGE (node, &node->hdr, - dp->d_ops->node_hdr_size ())); +XFS_DA_LOGRANGE (node, &node->hdr, dp->d_ops->node_hdr_size)); *bpp = bp;return (0 );
@@ -838,13 +837,12 @@ xfs_da3_node_rebalance(*/ dp->d_ops->node_hdr_to_disk (node1, &nodehdr1);xfs_trans_log_buf (tp, blk1->bp, -XFS_DA_LOGRANGE (node1, &node1->hdr, - dp->d_ops->node_hdr_size ())); +XFS_DA_LOGRANGE (node1, &node1->hdr, dp->d_ops->node_hdr_size)); dp->d_ops->node_hdr_to_disk (node2, &nodehdr2);xfs_trans_log_buf (tp, blk2->bp,XFS_DA_LOGRANGE (node2, &node2->hdr, - dp->d_ops->node_hdr_size () + + dp->d_ops->node_hdr_size + (sizeof (btree2[0 ]) * nodehdr2.count)));/*
@@ -915,7 +913,7 @@ xfs_da3_node_add( nodehdr.count +=1 ; dp->d_ops->node_hdr_to_disk (node, &nodehdr);xfs_trans_log_buf (state->args->trans, oldblk->bp, -XFS_DA_LOGRANGE (node, &node->hdr, dp->d_ops->node_hdr_size ())); +XFS_DA_LOGRANGE (node, &node->hdr, dp->d_ops->node_hdr_size));/* * Copy the last hash value from the oldblk to propagate upwards.
@@ -1350,7 +1348,7 @@ xfs_da3_node_remove( nodehdr.count -=1 ; dp->d_ops->node_hdr_to_disk (node, &nodehdr);xfs_trans_log_buf (state->args->trans, drop_blk->bp, -XFS_DA_LOGRANGE (node, &node->hdr, dp->d_ops->node_hdr_size ())); +XFS_DA_LOGRANGE (node, &node->hdr, dp->d_ops->node_hdr_size));/* * Copy the last hash value from the block to propagate upwards.
@@ -1423,7 +1421,7 @@ xfs_da3_node_unbalance( dp->d_ops->node_hdr_to_disk (save_node, &save_hdr);xfs_trans_log_buf (tp, save_blk->bp,XFS_DA_LOGRANGE (save_node, &save_node->hdr, - dp->d_ops->node_hdr_size ())); + dp->d_ops->node_hdr_size));/* * Save the last hashval in the remaining block for upward propagation.
fs/xfs/xfs_da_format.c +80 -142
442 lines not on this page · raw message
fs/xfs/xfs_dir2.c +1 -1
@@ -105,7 +105,7 @@ xfs_dir_mount( mp->m_dirleafblk =xfs_dir2_db_to_da (mp,XFS_DIR2_LEAF_FIRSTDB (mp)); mp->m_dirfreeblk =xfs_dir2_db_to_da (mp,XFS_DIR2_FREE_FIRSTDB (mp)); - nodehdr_size = mp->m_dir_inode_ops->node_hdr_size (); + nodehdr_size = mp->m_dir_inode_ops->node_hdr_size; mp->m_attr_node_ents = (mp->m_sb.sb_blocksize - nodehdr_size) / (uint )sizeof (xfs_da_node_entry_t); mp->m_dir_node_ents = (mp->m_dirblksize - nodehdr_size) /
fs/xfs/xfs_dir2.h +7 -7
@@ -59,10 +59,10 @@ struct xfs_dir_ops {struct xfs_dir2_data_free * (*data_bestfree_p)(struct xfs_dir2_data_hdr *hdr); -xfs_dir2_data_aoff_t (*data_dot_offset)(void); -xfs_dir2_data_aoff_t (*data_dotdot_offset)(void); -xfs_dir2_data_aoff_t (*data_first_offset)(void); -size_t (*data_entry_offset)(void ); +xfs_dir2_data_aoff_t data_dot_offset; +xfs_dir2_data_aoff_t data_dotdot_offset; +xfs_dir2_data_aoff_t data_first_offset; +size_t data_entry_offset;struct xfs_dir2_data_entry * (*data_dot_entry_p)(struct xfs_dir2_data_hdr *hdr);
@@ -75,7 +75,7 @@ struct xfs_dir_ops {struct xfs_dir2_data_unused * (*data_unused_p)(struct xfs_dir2_data_hdr *hdr); -int (*leaf_hdr_size)(void ); +int leaf_hdr_size;void (*leaf_hdr_to_disk)(struct xfs_dir2_leaf *to,struct xfs_dir3_icleaf_hdr *from); void (*leaf_hdr_from_disk)(struct xfs_dir3_icleaf_hdr *to,
@@ -84,7 +84,7 @@ struct xfs_dir_ops {struct xfs_dir2_leaf_entry * (*leaf_ents_p)(struct xfs_dir2_leaf *lp); -int (*node_hdr_size)(void ); +int node_hdr_size;void (*node_hdr_to_disk)(struct xfs_da_intnode *to,struct xfs_da3_icnode_hdr *from); void (*node_hdr_from_disk)(struct xfs_da3_icnode_hdr *to,
@@ -92,7 +92,7 @@ struct xfs_dir_ops {struct xfs_da_node_entry * (*node_tree_p)(struct xfs_da_intnode *dap); -int (*free_hdr_size)(void ); +int free_hdr_size;void (*free_hdr_to_disk)(struct xfs_dir2_free *to,struct xfs_dir3_icfree_hdr *from); void (*free_hdr_from_disk)(struct xfs_dir3_icfree_hdr *to,
fs/xfs/xfs_dir2_block.c +2 -2
@@ -951,7 +951,7 @@ xfs_dir2_leaf_to_block(while (dp->i_d.di_size > mp->m_dirblksize) {int hdrsz; - hdrsz = dp->d_ops->data_entry_offset (); + hdrsz = dp->d_ops->data_entry_offset; bestsp =xfs_dir2_leaf_bests_p (ltp);if (be16_to_cpu (bestsp[be32_to_cpu (ltp->bestcount) -1 ]) == mp->m_dirblksize - hdrsz) {
@@ -1185,7 +1185,7 @@ xfs_dir2_sf_to_block( blp[1 ].hashval =cpu_to_be32 (xfs_dir_hash_dotdot); blp[1 ].address =cpu_to_be32 (xfs_dir2_byte_to_dataptr (mp, (char *)dep - (char *)hdr)); - offset = dp->d_ops->data_first_offset (); + offset = dp->d_ops->data_first_offset;/* * Loop over existing entries, stuff them in. */
fs/xfs/xfs_dir2_data.c +4 -4
@@ -598,7 +598,7 @@ xfs_dir3_data_init( hdr->magic =cpu_to_be32 (XFS_DIR2_DATA_MAGIC ); bf = dp->d_ops->data_bestfree_p (hdr); - bf[0 ].offset =cpu_to_be16 (dp->d_ops->data_entry_offset ()); + bf[0 ].offset =cpu_to_be16 (dp->d_ops->data_entry_offset);for (i =1 ; i <XFS_DIR2_DATA_FD_COUNT ; i++) { bf[i].length =0 ; bf[i].offset =0 ;
@@ -610,7 +610,7 @@ xfs_dir3_data_init( dup = dp->d_ops->data_unused_p (hdr); dup->freetag =cpu_to_be16 (XFS_DIR2_DATA_FREE_TAG ); - t = mp->m_dirblksize - (uint )dp->d_ops->data_entry_offset (); + t = mp->m_dirblksize - (uint )dp->d_ops->data_entry_offset; bf[0 ].length =cpu_to_be16 (t); dup->length =cpu_to_be16 (t); *xfs_dir2_data_unused_tag_p (dup) =cpu_to_be16 ((char *)dup - (char *)hdr);
@@ -663,7 +663,7 @@ xfs_dir2_data_log_header( hdr->magic == cpu_to_be32(XFS_DIR3_BLOCK_MAGIC));#endif -xfs_trans_log_buf (tp, bp,0 , dp->d_ops->data_entry_offset () -1 ); +xfs_trans_log_buf (tp, bp,0 , dp->d_ops->data_entry_offset -1 ); }/*
@@ -742,7 +742,7 @@ xfs_dir2_data_make_free(* If this isn't the start of the block, then back up to * the previous entry and see if it's free. */ -if (offset > dp->d_ops->data_entry_offset ()) { +if (offset > dp->d_ops->data_entry_offset) {__be16 *tagp;/* tag just before us */ tagp = (__be16 *)((char *)hdr + offset) -1 ;
fs/xfs/xfs_dir2_leaf.c +3 -3
@@ -1116,7 +1116,7 @@ xfs_dir3_leaf_log_header( leaf->hdr.info.magic == cpu_to_be16(XFS_DIR3_LEAFN_MAGIC));xfs_trans_log_buf (tp, bp, (uint)((char *)&leaf->hdr - (char *)leaf), - dp->d_ops->leaf_hdr_size () -1 ); + dp->d_ops->leaf_hdr_size -1 ); }/*
@@ -1424,7 +1424,7 @@ xfs_dir2_leaf_removename(* If the data block is now empty then get rid of the data block. */ if (be16_to_cpu (bf[0 ].length) == - mp->m_dirblksize - dp->d_ops->data_entry_offset ()) { + mp->m_dirblksize - dp->d_ops->data_entry_offset) {ASSERT (db != mp->m_dirdatablk);if ((error =xfs_dir2_shrink_inode (args, db, dbp))) {/*
@@ -1623,7 +1623,7 @@ xfs_dir2_leaf_trim_data(ASSERT (hdr->magic ==cpu_to_be32 (XFS_DIR2_DATA_MAGIC ) || hdr->magic ==cpu_to_be32 (XFS_DIR3_DATA_MAGIC ));ASSERT (be16_to_cpu (bf[0 ].length) == - mp->m_dirblksize - dp->d_ops->data_entry_offset ()); + mp->m_dirblksize - dp->d_ops->data_entry_offset); ASSERT(db == be32_to_cpu(ltp->bestcount) - 1); }#endif
fs/xfs/xfs_dir2_node.c +4 -4
@@ -274,7 +274,7 @@ xfs_dir2_free_log_header(ASSERT (free->hdr.magic ==cpu_to_be32 (XFS_DIR2_FREE_MAGIC ) || free->hdr.magic ==cpu_to_be32 (XFS_DIR3_FREE_MAGIC ));#endif -xfs_trans_log_buf (tp, bp,0 , dp->d_ops->free_hdr_size () -1 ); +xfs_trans_log_buf (tp, bp,0 , dp->d_ops->free_hdr_size -1 ); }/*
@@ -1268,7 +1268,7 @@ xfs_dir2_leafn_remove(* (usually). */ if (longest == mp->m_dirblksize - - dp->d_ops->data_entry_offset ()) { + dp->d_ops->data_entry_offset) {/* * Try to punch out the data block. */
@@ -1300,7 +1300,7 @@ xfs_dir2_leafn_remove(* Return indication of whether this leaf block is empty enough * to justify trying to join it with a neighbor. */ - *rval = (dp->d_ops->leaf_hdr_size () + + *rval = (dp->d_ops->leaf_hdr_size + (uint )sizeof (ents[0 ]) * (leafhdr.count - leafhdr.stale)) < mp->m_dir_magicpct;return 0 ;
@@ -1409,7 +1409,7 @@ xfs_dir2_leafn_toosmall(xfs_dir3_leaf_check (dp, blk->bp); count = leafhdr.count - leafhdr.stale; - bytes = dp->d_ops->leaf_hdr_size () + count *sizeof (ents[0 ]); + bytes = dp->d_ops->leaf_hdr_size + count *sizeof (ents[0 ]);if (bytes > (state->blocksize >>1 )) {/* * Blk over 50%, don't try to join.
fs/xfs/xfs_dir2_readdir.c +3 -3
@@ -119,9 +119,9 @@ xfs_dir2_sf_getdents(* mp->m_dirdatablk. */ dot_offset =xfs_dir2_db_off_to_dataptr (mp, mp->m_dirdatablk, - dp->d_ops->data_dot_offset ()); + dp->d_ops->data_dot_offset); dotdot_offset =xfs_dir2_db_off_to_dataptr (mp, mp->m_dirdatablk, - dp->d_ops->data_dotdot_offset ()); + dp->d_ops->data_dotdot_offset);/* * Put . entry unless we're starting past it.
@@ -584,7 +584,7 @@ xfs_dir2_leaf_getdents(* Skip past the header. */ if (byteoff ==0 ) - curoff += dp->d_ops->data_entry_offset (); + curoff += dp->d_ops->data_entry_offset;/* * Skip past entries until we reach our offset. */
fs/xfs/xfs_dir2_sf.c +3 -3
@@ -473,7 +473,7 @@ xfs_dir2_sf_addname_hard(* to insert the new entry. * If it's going to end up at the end then oldsfep will point there. */ - for (offset = dp->d_ops->data_first_offset(), + for (offset = dp->d_ops->data_first_offset, oldsfep = xfs_dir2_sf_firstentry(oldsfp), add_datasize = dp->d_ops->data_entsize(args->namelen), eof = (char *)oldsfep == &buf[old_isize];
@@ -556,7 +556,7 @@ xfs_dir2_sf_addname_pick( sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data; size = dp->d_ops->data_entsize (args->namelen); - offset = dp->d_ops->data_first_offset (); + offset = dp->d_ops->data_first_offset; sfep =xfs_dir2_sf_firstentry (sfp); holefit =0 ;/*
@@ -629,7 +629,7 @@ xfs_dir2_sf_check( mp = dp->i_mount; sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data; - offset = dp->d_ops->data_first_offset (); + offset = dp->d_ops->data_first_offset; ino = dp->d_ops->sf_get_parent_ino (sfp); i8count = ino >XFS_DIR2_MAX_SHORT_INUM ;
Signature · 6 lines
1.8.4.rc3 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 19/19] xfs: convert directory vector functions to constants
Quoted 20 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Many of the vectorised function calls now take no parameters and return a constant value. There is no reason for these to be vectored functions, so convert them to constants
Binary sizes:
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3 789005 96802 1096 886903 d8997 fs/xfs/xfs.o.p4 789061 96802 1096 886959 d88af fs/xfs/xfs.o.p5 789733 96802 1096 887631 d8b4f fs/xfs/xfs.o.p6 791421 96802 1096 889319 d91e7 fs/xfs/xfs.o.p7 791701 96802 1096 889599 d92ff fs/xfs/xfs.o.p8 791205 96802 1096 889103 d91cf fs/xfs/xfs.o.p9
Quoted 1 line
Signed-off-by Dave Chinner <[email protected]>
Hmmm. This one doesn't seem to apply. Maybe it's just me.
-Ben
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 19/19] xfs: convert directory vector functions to constants
Quoted 21 lines · Ben Myers
Quoted 20 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Many of the vectorised function calls now take no parameters and return a constant value. There is no reason for these to be vectored functions, so convert them to constants
Binary sizes:
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3 789005 96802 1096 886903 d8997 fs/xfs/xfs.o.p4 789061 96802 1096 886959 d88af fs/xfs/xfs.o.p5 789733 96802 1096 887631 d8b4f fs/xfs/xfs.o.p6 791421 96802 1096 889319 d91e7 fs/xfs/xfs.o.p7 791701 96802 1096 889599 d92ff fs/xfs/xfs.o.p8 791205 96802 1096 889103 d91cf fs/xfs/xfs.o.p9
Quoted 3 lines
Quoted 1 line
Signed-off-by Dave Chinner <[email protected]>Hmmm. This one doesn't seem to apply. Maybe it's just me.
Applies without mismatch here on an 3.12-rc5 + oss-xfs/master tree here. What's the reject that you get?
Cheers,
Dave.
Signature · 7 lines
Dave Chinner [email protected] _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 19/19] xfs: convert directory vector functions to constants
Quoted 22 lines · Dave Chinner
Quoted 21 lines · Ben Myers
Quoted 20 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Many of the vectorised function calls now take no parameters and return a constant value. There is no reason for these to be vectored functions, so convert them to constants
Binary sizes:
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3 789005 96802 1096 886903 d8997 fs/xfs/xfs.o.p4 789061 96802 1096 886959 d88af fs/xfs/xfs.o.p5 789733 96802 1096 887631 d8b4f fs/xfs/xfs.o.p6 791421 96802 1096 889319 d91e7 fs/xfs/xfs.o.p7 791701 96802 1096 889599 d92ff fs/xfs/xfs.o.p8 791205 96802 1096 889103 d91cf fs/xfs/xfs.o.p9
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Dave Chinner <[email protected]>Hmmm. This one doesn't seem to apply. Maybe it's just me.
Applies without mismatch here on an 3.12-rc5 + oss-xfs/master tree here. What's the reject that you get?
Like so:
$ q pu Applying patch xfs-convert-directory-vector-functions-to-constants.patch patching file fs/xfs/xfs_da_btree.c patching file fs/xfs/xfs_da_format.c Hunk #13 FAILED at 571. Hunk #14 FAILED at 608. Hunk #15 succeeded at 641 (offset -74 lines). Hunk #16 FAILED at 729. Hunk #17 succeeded at 683 (offset -82 lines). Hunk #18 FAILED at 779. Hunk #19 succeeded at 728 (offset -87 lines). Hunk #20 FAILED at 829. 5 out of 20 hunks FAILED -- rejects in file fs/xfs/xfs_da_format.c patching file fs/xfs/xfs_dir2.c patching file fs/xfs/xfs_dir2.h Hunk #4 FAILED at 92. 1 out of 4 hunks FAILED -- rejects in file fs/xfs/xfs_dir2.h patching file fs/xfs/xfs_dir2_block.c patching file fs/xfs/xfs_dir2_data.c patching file fs/xfs/xfs_dir2_leaf.c patching file fs/xfs/xfs_dir2_node.c Hunk #1 FAILED at 274. Hunk #2 succeeded at 1267 (offset -1 lines). Hunk #3 succeeded at 1299 (offset -1 lines). Hunk #4 succeeded at 1408 (offset -1 lines). 1 out of 4 hunks FAILED -- rejects in file fs/xfs/xfs_dir2_node.c patching file fs/xfs/xfs_dir2_readdir.c patching file fs/xfs/xfs_dir2_sf.c Patch xfs-convert-directory-vector-functions-to-constants.patch does not apply (enforce with -f)
That's on 74564fb48.
Thanks,
Ben
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 19/19] xfs: convert directory vector functions to constants
Quoted 62 lines · Ben Myers
Quoted 22 lines · Dave Chinner
Quoted 21 lines · Ben Myers
Quoted 20 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Many of the vectorised function calls now take no parameters and return a constant value. There is no reason for these to be vectored functions, so convert them to constants
Binary sizes:
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3 789005 96802 1096 886903 d8997 fs/xfs/xfs.o.p4 789061 96802 1096 886959 d88af fs/xfs/xfs.o.p5 789733 96802 1096 887631 d8b4f fs/xfs/xfs.o.p6 791421 96802 1096 889319 d91e7 fs/xfs/xfs.o.p7 791701 96802 1096 889599 d92ff fs/xfs/xfs.o.p8 791205 96802 1096 889103 d91cf fs/xfs/xfs.o.p9Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Dave Chinner <[email protected]>Hmmm. This one doesn't seem to apply. Maybe it's just me.
Applies without mismatch here on an 3.12-rc5 + oss-xfs/master tree here. What's the reject that you get?
Like so:
$ q pu Applying patch xfs-convert-directory-vector-functions-to-constants.patch patching file fs/xfs/xfs_da_btree.c patching file fs/xfs/xfs_da_format.c Hunk #13 FAILED at 571. Hunk #14 FAILED at 608. Hunk #15 succeeded at 641 (offset -74 lines). Hunk #16 FAILED at 729. Hunk #17 succeeded at 683 (offset -82 lines). Hunk #18 FAILED at 779. Hunk #19 succeeded at 728 (offset -87 lines). Hunk #20 FAILED at 829. 5 out of 20 hunks FAILED -- rejects in file fs/xfs/xfs_da_format.c patching file fs/xfs/xfs_dir2.c patching file fs/xfs/xfs_dir2.h Hunk #4 FAILED at 92. 1 out of 4 hunks FAILED -- rejects in file fs/xfs/xfs_dir2.h patching file fs/xfs/xfs_dir2_block.c patching file fs/xfs/xfs_dir2_data.c patching file fs/xfs/xfs_dir2_leaf.c patching file fs/xfs/xfs_dir2_node.c Hunk #1 FAILED at 274. Hunk #2 succeeded at 1267 (offset -1 lines). Hunk #3 succeeded at 1299 (offset -1 lines). Hunk #4 succeeded at 1408 (offset -1 lines). 1 out of 4 hunks FAILED -- rejects in file fs/xfs/xfs_dir2_node.c patching file fs/xfs/xfs_dir2_readdir.c patching file fs/xfs/xfs_dir2_sf.c Patch xfs-convert-directory-vector-functions-to-constants.patch does not apply (enforce with -f)
Quoted 1 line
That's on
74564fb48.
To be more specific, these are the rejects. Maybe I missed a patch.
xfs/xfs_da_format.c +16 -28
@@ -571,22 +512,16 @@* Directory free space block operations */ static int -xfs_dir2_free_hdr_size (void ) -{ -return sizeof (struct xfs_dir2_free_hdr ); -} - -static int xfs_dir2_free_max_bests (struct xfs_mount *mp) { -return (mp->m_dirblksize -xfs_dir2_free_hdr_size ()) / +return (mp->m_dirblksize -sizeof (struct xfs_dir2_free_hdr )) /sizeof (xfs_dir2_data_off_t); }static __be16 *xfs_dir2_free_bests_p (struct xfs_dir2_free *free) { -return (__be16 *)((char *)free +xfs_dir2_free_hdr_size ()); +return (__be16 *)((char *)free +sizeof (struct xfs_dir2_free_hdr )); }/*
@@ -608,22 +543,16 @@ }static int -xfs_dir3_free_hdr_size (void ) -{ -return sizeof (struct xfs_dir3_free_hdr ); -} - -static int xfs_dir3_free_max_bests (struct xfs_mount *mp) { -return (mp->m_dirblksize -xfs_dir3_free_hdr_size ()) / +return (mp->m_dirblksize -sizeof (struct xfs_dir3_free_hdr )) /sizeof (xfs_dir2_data_off_t); }static __be16 *xfs_dir3_free_bests_p (struct xfs_dir2_free *free) { -return (__be16 *)((char *)free +xfs_dir3_free_hdr_size ()); +return (__be16 *)((char *)free +sizeof (struct xfs_dir3_free_hdr )); }/*
@@ -729,18 +661,18 @@ .data_entry_p = xfs_dir2_data_entry_p, .data_unused_p = xfs_dir2_data_unused_p, - .leaf_hdr_size = xfs_dir2_leaf_hdr_size, + .leaf_hdr_size = sizeof(struct xfs_dir2_leaf_hdr), .leaf_hdr_to_disk = xfs_dir2_leaf_hdr_to_disk, .leaf_hdr_from_disk = xfs_dir2_leaf_hdr_from_disk, .leaf_max_ents = xfs_dir2_max_leaf_ents, .leaf_ents_p = xfs_dir2_leaf_ents_p, - .node_hdr_size = xfs_da2_node_hdr_size, + .node_hdr_size = sizeof(struct xfs_da_node_hdr), .node_hdr_to_disk = xfs_da2_node_hdr_to_disk, .node_hdr_from_disk = xfs_da2_node_hdr_from_disk, .node_tree_p = xfs_da2_node_tree_p, - .free_hdr_size = xfs_dir2_free_hdr_size, + .free_hdr_size = sizeof(struct xfs_dir2_free_hdr), .free_hdr_to_disk = xfs_dir2_free_hdr_to_disk, .free_hdr_from_disk = xfs_dir2_free_hdr_from_disk, .free_max_bests = xfs_dir2_free_max_bests,
@@ -779,18 +714,18 @@ .data_entry_p = xfs_dir2_data_entry_p, .data_unused_p = xfs_dir2_data_unused_p, - .leaf_hdr_size = xfs_dir2_leaf_hdr_size, + .leaf_hdr_size = sizeof(struct xfs_dir2_leaf_hdr), .leaf_hdr_to_disk = xfs_dir2_leaf_hdr_to_disk, .leaf_hdr_from_disk = xfs_dir2_leaf_hdr_from_disk, .leaf_max_ents = xfs_dir2_max_leaf_ents, .leaf_ents_p = xfs_dir2_leaf_ents_p, - .node_hdr_size = xfs_da2_node_hdr_size, + .node_hdr_size = sizeof(struct xfs_da_node_hdr), .node_hdr_to_disk = xfs_da2_node_hdr_to_disk, .node_hdr_from_disk = xfs_da2_node_hdr_from_disk, .node_tree_p = xfs_da2_node_tree_p, - .free_hdr_size = xfs_dir2_free_hdr_size, + .free_hdr_size = sizeof(struct xfs_dir2_free_hdr), .free_hdr_to_disk = xfs_dir2_free_hdr_to_disk, .free_hdr_from_disk = xfs_dir2_free_hdr_from_disk, .free_max_bests = xfs_dir2_free_max_bests,
@@ -829,35 +767,35 @@ .data_entry_p = xfs_dir3_data_entry_p, .data_unused_p = xfs_dir3_data_unused_p, - .leaf_hdr_size = xfs_dir3_leaf_hdr_size, + .leaf_hdr_size = sizeof(struct xfs_dir3_leaf_hdr), .leaf_hdr_to_disk = xfs_dir3_leaf_hdr_to_disk, .leaf_hdr_from_disk = xfs_dir3_leaf_hdr_from_disk, .leaf_max_ents = xfs_dir3_max_leaf_ents, .leaf_ents_p = xfs_dir3_leaf_ents_p, - .node_hdr_size = xfs_da3_node_hdr_size, + .node_hdr_size = sizeof(struct xfs_da3_node_hdr), .node_hdr_to_disk = xfs_da3_node_hdr_to_disk, .node_hdr_from_disk = xfs_da3_node_hdr_from_disk, .node_tree_p = xfs_da3_node_tree_p, - .free_hdr_size = xfs_dir3_free_hdr_size, + .free_hdr_size = sizeof(struct xfs_dir3_free_hdr), .free_hdr_to_disk = xfs_dir3_free_hdr_to_disk, .free_hdr_from_disk = xfs_dir3_free_hdr_from_disk, - .free_max_bests = xfs_dir2_free_max_bests, + .free_max_bests = xfs_dir3_free_max_bests, .free_bests_p = xfs_dir3_free_bests_p, .db_to_fdb = xfs_dir3_db_to_fdb, .db_to_fdindex = xfs_dir3_db_to_fdindex, };const struct xfs_dir_ops xfs_dir2_nondir_ops = { - .node_hdr_size = xfs_da2_node_hdr_size, + .node_hdr_size =sizeof (struct xfs_da_node_hdr ), .node_hdr_to_disk = xfs_da2_node_hdr_to_disk, .node_hdr_from_disk = xfs_da2_node_hdr_from_disk, .node_tree_p = xfs_da2_node_tree_p, };const struct xfs_dir_ops xfs_dir3_nondir_ops = { - .node_hdr_size = xfs_da3_node_hdr_size, + .node_hdr_size =sizeof (struct xfs_da3_node_hdr ), .node_hdr_to_disk = xfs_da3_node_hdr_to_disk, .node_hdr_from_disk = xfs_da3_node_hdr_from_disk, .node_tree_p = xfs_da3_node_tree_p,
xfs/xfs_dir2.h +1 -1
@@ -92,7 +92,7 @@struct xfs_da_node_entry * (*node_tree_p)(struct xfs_da_intnode *dap); -int (*free_hdr_size)(void ); +int free_hdr_size;void (*free_hdr_to_disk)(struct xfs_dir2_free *to,struct xfs_dir3_icfree_hdr *from); void (*free_hdr_from_disk)(struct xfs_dir3_icfree_hdr *to,
xfs/xfs_dir2_node.c +1 -1
@@ -274,7 +274,7 @@ASSERT (free->hdr.magic ==cpu_to_be32 (XFS_DIR2_FREE_MAGIC ) || free->hdr.magic ==cpu_to_be32 (XFS_DIR3_FREE_MAGIC ));#endif -xfs_trans_log_buf (tp, bp,0 , dp->d_ops->free_hdr_size () -1 ); +xfs_trans_log_buf (tp, bp,0 , dp->d_ops->free_hdr_size -1 ); }/*
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 19/19] xfs: convert directory vector functions to constants
Quoted 63 lines · Ben Myers
Quoted 62 lines · Ben Myers
Quoted 22 lines · Dave Chinner
Quoted 21 lines · Ben Myers
Quoted 20 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Many of the vectorised function calls now take no parameters and return a constant value. There is no reason for these to be vectored functions, so convert them to constants
Binary sizes:
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3 789005 96802 1096 886903 d8997 fs/xfs/xfs.o.p4 789061 96802 1096 886959 d88af fs/xfs/xfs.o.p5 789733 96802 1096 887631 d8b4f fs/xfs/xfs.o.p6 791421 96802 1096 889319 d91e7 fs/xfs/xfs.o.p7 791701 96802 1096 889599 d92ff fs/xfs/xfs.o.p8 791205 96802 1096 889103 d91cf fs/xfs/xfs.o.p9Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Dave Chinner <[email protected]>Hmmm. This one doesn't seem to apply. Maybe it's just me.
Applies without mismatch here on an 3.12-rc5 + oss-xfs/master tree here. What's the reject that you get?
Like so:
$ q pu Applying patch xfs-convert-directory-vector-functions-to-constants.patch patching file fs/xfs/xfs_da_btree.c patching file fs/xfs/xfs_da_format.c Hunk #13 FAILED at 571. Hunk #14 FAILED at 608. Hunk #15 succeeded at 641 (offset -74 lines). Hunk #16 FAILED at 729. Hunk #17 succeeded at 683 (offset -82 lines). Hunk #18 FAILED at 779. Hunk #19 succeeded at 728 (offset -87 lines). Hunk #20 FAILED at 829. 5 out of 20 hunks FAILED -- rejects in file fs/xfs/xfs_da_format.c patching file fs/xfs/xfs_dir2.c patching file fs/xfs/xfs_dir2.h Hunk #4 FAILED at 92. 1 out of 4 hunks FAILED -- rejects in file fs/xfs/xfs_dir2.h patching file fs/xfs/xfs_dir2_block.c patching file fs/xfs/xfs_dir2_data.c patching file fs/xfs/xfs_dir2_leaf.c patching file fs/xfs/xfs_dir2_node.c Hunk #1 FAILED at 274. Hunk #2 succeeded at 1267 (offset -1 lines). Hunk #3 succeeded at 1299 (offset -1 lines). Hunk #4 succeeded at 1408 (offset -1 lines). 1 out of 4 hunks FAILED -- rejects in file fs/xfs/xfs_dir2_node.c patching file fs/xfs/xfs_dir2_readdir.c patching file fs/xfs/xfs_dir2_sf.c Patch xfs-convert-directory-vector-functions-to-constants.patch does not apply (enforce with -f)
Quoted 3 lines
Quoted 1 line
That's on
74564fb48.To be more specific, these are the rejects. Maybe I missed a patch.
Looks like you might be missing patch 18 as all the rejects are against hunks introduced by that patch.
Cheers,
Dave.
Signature · 7 lines
Dave Chinner [email protected] _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 19/19] xfs: convert directory vector functions to constants
Quoted 64 lines · Dave Chinner
Quoted 63 lines · Ben Myers
Quoted 62 lines · Ben Myers
Quoted 22 lines · Dave Chinner
Quoted 21 lines · Ben Myers
Quoted 20 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Many of the vectorised function calls now take no parameters and return a constant value. There is no reason for these to be vectored functions, so convert them to constants
Binary sizes:
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3 789005 96802 1096 886903 d8997 fs/xfs/xfs.o.p4 789061 96802 1096 886959 d88af fs/xfs/xfs.o.p5 789733 96802 1096 887631 d8b4f fs/xfs/xfs.o.p6 791421 96802 1096 889319 d91e7 fs/xfs/xfs.o.p7 791701 96802 1096 889599 d92ff fs/xfs/xfs.o.p8 791205 96802 1096 889103 d91cf fs/xfs/xfs.o.p9Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Dave Chinner <[email protected]>Hmmm. This one doesn't seem to apply. Maybe it's just me.
Applies without mismatch here on an 3.12-rc5 + oss-xfs/master tree here. What's the reject that you get?
Like so:
$ q pu Applying patch xfs-convert-directory-vector-functions-to-constants.patch patching file fs/xfs/xfs_da_btree.c patching file fs/xfs/xfs_da_format.c Hunk #13 FAILED at 571. Hunk #14 FAILED at 608. Hunk #15 succeeded at 641 (offset -74 lines). Hunk #16 FAILED at 729. Hunk #17 succeeded at 683 (offset -82 lines). Hunk #18 FAILED at 779. Hunk #19 succeeded at 728 (offset -87 lines). Hunk #20 FAILED at 829. 5 out of 20 hunks FAILED -- rejects in file fs/xfs/xfs_da_format.c patching file fs/xfs/xfs_dir2.c patching file fs/xfs/xfs_dir2.h Hunk #4 FAILED at 92. 1 out of 4 hunks FAILED -- rejects in file fs/xfs/xfs_dir2.h patching file fs/xfs/xfs_dir2_block.c patching file fs/xfs/xfs_dir2_data.c patching file fs/xfs/xfs_dir2_leaf.c patching file fs/xfs/xfs_dir2_node.c Hunk #1 FAILED at 274. Hunk #2 succeeded at 1267 (offset -1 lines). Hunk #3 succeeded at 1299 (offset -1 lines). Hunk #4 succeeded at 1408 (offset -1 lines). 1 out of 4 hunks FAILED -- rejects in file fs/xfs/xfs_dir2_node.c patching file fs/xfs/xfs_dir2_readdir.c patching file fs/xfs/xfs_dir2_sf.c Patch xfs-convert-directory-vector-functions-to-constants.patch does not apply (enforce with -f)
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
That's on
74564fb48.To be more specific, these are the rejects. Maybe I missed a patch.
Looks like you might be missing patch 18 as all the rejects are against hunks introduced by that patch.
That was it, thanks.
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 19/19] xfs: convert directory vector functions to constants
In reply to Dave ChinnerQuoted 37 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Many of the vectorised function calls now take no parameters and return a constant value. There is no reason for these to be vectored functions, so convert them to constants
Binary sizes:
text data bss dec hex filename
794490 96802 1096 892388 d9de4 fs/xfs/xfs.o.orig 792986 96802 1096 890884 d9804 fs/xfs/xfs.o.p1 792350 96802 1096 890248 d9588 fs/xfs/xfs.o.p2 789293 96802 1096 887191 d8997 fs/xfs/xfs.o.p3 789005 96802 1096 886903 d8997 fs/xfs/xfs.o.p4 789061 96802 1096 886959 d88af fs/xfs/xfs.o.p5 789733 96802 1096 887631 d8b4f fs/xfs/xfs.o.p6 791421 96802 1096 889319 d91e7 fs/xfs/xfs.o.p7 791701 96802 1096 889599 d92ff fs/xfs/xfs.o.p8 791205 96802 1096 889103 d91cf fs/xfs/xfs.o.p9Signed-off-by Dave Chinner <[email protected]>fs/xfs/xfs_da_format.c +2
-2@@ -879,35 +817,35 @@ const struct xfs_dir_ops xfs_dir3_ops = { .data_entry_p = xfs_dir3_data_entry_p, .data_unused_p = xfs_dir3_data_unused_p, - .leaf_hdr_size = xfs_dir3_leaf_hdr_size, + .leaf_hdr_size = sizeof(struct xfs_dir3_leaf_hdr), .leaf_hdr_to_disk = xfs_dir3_leaf_hdr_to_disk, .leaf_hdr_from_disk = xfs_dir3_leaf_hdr_from_disk, .leaf_max_ents = xfs_dir3_max_leaf_ents, .leaf_ents_p = xfs_dir3_leaf_ents_p, - .node_hdr_size = xfs_da3_node_hdr_size, + .node_hdr_size = sizeof(struct xfs_da3_node_hdr),
fs/xfs/xfs_da_format.c const struct xfs_dir_ops xfs_dir3_ops = { · line 834
Quoted 10 lines
fs/xfs/xfs_da_format.c +2
-2.node_hdr_to_disk = xfs_da3_node_hdr_to_disk, .node_hdr_from_disk = xfs_da3_node_hdr_from_disk, .node_tree_p = xfs_da3_node_tree_p, - .free_hdr_size = xfs_dir3_free_hdr_size, + .free_hdr_size = sizeof(struct xfs_dir3_free_hdr), .free_hdr_to_disk = xfs_dir3_free_hdr_to_disk, .free_hdr_from_disk = xfs_dir3_free_hdr_from_disk, - .free_max_bests = xfs_dir2_free_max_bests, + .free_max_bests = xfs_dir3_free_max_bests,
^^^^^^^^^^^^^^^^^^^^^^^^
That looks like it fixes a bug introduced in one of the earlier patches. Other than that this looks good.
I like how . and .. offsets changed into constants.
-Ben
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 10 lines · Dave Chinner
Hi folks,
This is an update of the previous patches I sent here:
http://oss.sgi.com/pipermail/xfs/2013-September/030390.html
http://oss.sgi.com/pipermail/xfs/2013-September/030398.htmlI've addressed the review comments from Eric, Ben and Christoph and fixed the non-debug build failure that Michael Semon reported. Comments and testing welcome.
Applied 4-10.
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs