From: Dave Chinner Date: Wed, 13 Nov 2013 06:40:34 +0000 (+0000) Subject: libxfs: Minor cleanup and bug fix sync X-Git-Tag: v3.2.0-alpha2~32 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6d77a21f263ea403bef0940a524212e6fa03d04;p=thirdparty%2Fxfsprogs-dev.git libxfs: Minor cleanup and bug fix sync These bring all the small single line comment, whitespace and minor code differences into sync with the kernel code. Anything left at this point is an intentional difference. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Rich Johnston --- diff --git a/include/xfs_fs.h b/include/xfs_fs.h index c43ba98c9..554fd66c6 100644 --- a/include/xfs_fs.h +++ b/include/xfs_fs.h @@ -358,7 +358,7 @@ typedef struct xfs_error_injection { * Speculative preallocation trimming. */ #define XFS_EOFBLOCKS_VERSION 1 -struct xfs_eofblocks { +struct xfs_fs_eofblocks { __u32 eof_version; __u32 eof_flags; uid_t eof_uid; @@ -516,7 +516,7 @@ typedef struct xfs_swapext /* XFS_IOC_GETBIOSIZE ---- deprecated 47 */ #define XFS_IOC_GETBMAPX _IOWR('X', 56, struct getbmap) #define XFS_IOC_ZERO_RANGE _IOW ('X', 57, struct xfs_flock64) -#define XFS_IOC_FREE_EOFBLOCKS _IOR ('X', 58, struct xfs_eofblocks) +#define XFS_IOC_FREE_EOFBLOCKS _IOR ('X', 58, struct xfs_fs_eofblocks) /* * ioctl commands that replace IRIX syssgi()'s diff --git a/include/xfs_quota_defs.h b/include/xfs_quota_defs.h index e6b0d6e1f..b3b2b1065 100644 --- a/include/xfs_quota_defs.h +++ b/include/xfs_quota_defs.h @@ -154,4 +154,8 @@ typedef __uint16_t xfs_qwarncnt_t; (XFS_QMOPT_UQUOTA | XFS_QMOPT_PQUOTA | XFS_QMOPT_GQUOTA) #define XFS_QMOPT_RESBLK_MASK (XFS_QMOPT_RES_REGBLKS | XFS_QMOPT_RES_RTBLKS) +extern int xfs_dqcheck(struct xfs_mount *mp, xfs_disk_dquot_t *ddq, + xfs_dqid_t id, uint type, uint flags, char *str); +extern int xfs_calc_dquots_per_chunk(struct xfs_mount *mp, unsigned int nbblks); + #endif /* __XFS_QUOTA_H__ */ diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c index c09b0f346..fd52397bf 100644 --- a/libxfs/xfs_attr_leaf.c +++ b/libxfs/xfs_attr_leaf.c @@ -599,7 +599,7 @@ xfs_attr_shortform_getvalue(xfs_da_args_t *args) xfs_attr_sf_entry_t *sfe; int i; - ASSERT(args->dp->i_d.di_aformat == XFS_IFINLINE); + ASSERT(args->dp->i_afp->if_flags == XFS_IFINLINE); sf = (xfs_attr_shortform_t *)args->dp->i_afp->if_u1.if_data; sfe = &sf->list[0]; for (i = 0; i < sf->hdr.count; @@ -909,7 +909,6 @@ out: return error; } - /*======================================================================== * Routines used for growing the Btree. *========================================================================*/ @@ -1270,7 +1269,6 @@ xfs_attr3_leaf_compact( ichdr_dst->freemap[0].size = ichdr_dst->firstused - ichdr_dst->freemap[0].base; - /* write the header back to initialise the underlying buffer */ xfs_attr3_leaf_hdr_to_disk(leaf_dst, ichdr_dst); diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c index 7336abfa2..3e80c644a 100644 --- a/libxfs/xfs_bmap.c +++ b/libxfs/xfs_bmap.c @@ -510,8 +510,8 @@ xfs_bmap_trace_exlist( /* * Validate that the bmbt_irecs being returned from bmapi are valid - * given the callers original parameters. Specifically check the - * ranges of the returned irecs to ensure that they only extent beyond + * given the caller's original parameters. Specifically check the + * ranges of the returned irecs to ensure that they only extend beyond * the given parameters if the XFS_BMAPI_ENTIRE flag was set. */ STATIC void @@ -1515,7 +1515,7 @@ xfs_bmap_first_unused( } /* - * Returns the file-relative block number of the last block + 1 before + * Returns the file-relative block number of the last block - 1 before * last_block (input value) in the file. * This is not based on i_size, it is based on the extent records. * Returns 0 for local files, as they do not have extent records. diff --git a/libxfs/xfs_bmap_btree.c b/libxfs/xfs_bmap_btree.c index a848b7179..3136e4fd1 100644 --- a/libxfs/xfs_bmap_btree.c +++ b/libxfs/xfs_bmap_btree.c @@ -737,7 +737,7 @@ xfs_bmbt_verify( * precise. */ level = be16_to_cpu(block->bb_level); - if (level > MAX(mp->m_bm_maxlevels[0], mp->m_bm_maxlevels[1])) + if (level > max(mp->m_bm_maxlevels[0], mp->m_bm_maxlevels[1])) return false; if (be16_to_cpu(block->bb_numrecs) > mp->m_bmap_dmxr[level != 0]) return false; diff --git a/libxfs/xfs_dir2_leaf.c b/libxfs/xfs_dir2_leaf.c index c035c4dfb..683536e7a 100644 --- a/libxfs/xfs_dir2_leaf.c +++ b/libxfs/xfs_dir2_leaf.c @@ -1072,7 +1072,6 @@ xfs_dir3_leaf_compact_x1( *highstalep = highstale; } - /* * Log the bests entries indicated from a leaf1 block. */ diff --git a/libxfs/xfs_dir2_node.c b/libxfs/xfs_dir2_node.c index 6a245e5cf..10d1d8138 100644 --- a/libxfs/xfs_dir2_node.c +++ b/libxfs/xfs_dir2_node.c @@ -1796,7 +1796,7 @@ xfs_dir2_node_addname_int( /* * Look at the current free entry. Is it good enough? * - * The bests initialisation should be where the buffer is read in + * The bests initialisation should be where the bufer is read in * the above branch. But gcc is too stupid to realise that bests * and the freehdr are actually initialised if they are placed * there, so we have to do it here to avoid warnings. Blech. diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c index 4683287b4..afe1a824e 100644 --- a/libxfs/xfs_ialloc.c +++ b/libxfs/xfs_ialloc.c @@ -484,7 +484,7 @@ xfs_ialloc_next_ag( /* * Select an allocation group to look for a free inode in, based on the parent - * inode and then mode. Return the allocation group buffer. + * inode and the mode. Return the allocation group buffer. */ STATIC xfs_agnumber_t xfs_ialloc_ag_select( @@ -706,7 +706,7 @@ xfs_dialloc_ag( error = xfs_inobt_get_rec(cur, &rec, &j); if (error) goto error0; - XFS_WANT_CORRUPTED_GOTO(i == 1, error0); + XFS_WANT_CORRUPTED_GOTO(j == 1, error0); if (rec.ir_freecount > 0) { /* diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c index dbe1b87d0..97d2329b3 100644 --- a/libxfs/xfs_inode_buf.c +++ b/libxfs/xfs_inode_buf.c @@ -101,6 +101,7 @@ xfs_inode_buf_verify( xfs_inobp_check(mp, bp); } + static void xfs_inode_buf_read_verify( struct xfs_buf *bp) @@ -299,6 +300,7 @@ xfs_dinode_verify( return false; return true; } + void xfs_dinode_calc_crc( struct xfs_mount *mp, diff --git a/libxfs/xfs_inode_fork.c b/libxfs/xfs_inode_fork.c index 1c006f90a..190690c0c 100644 --- a/libxfs/xfs_inode_fork.c +++ b/libxfs/xfs_inode_fork.c @@ -138,7 +138,8 @@ xfs_iformat_fork( } di_size = be64_to_cpu(dip->di_size); - if (unlikely(di_size > XFS_DFORK_DSIZE(dip, ip->i_mount))) { + if (unlikely(di_size < 0 || + di_size > XFS_DFORK_DSIZE(dip, ip->i_mount))) { xfs_warn(ip->i_mount, "corrupt inode %Lu (bad size %Ld for local inode).", (unsigned long long) ip->i_ino, @@ -444,7 +445,7 @@ xfs_iread_extents( * * The caller must not request to add more records than would fit in * the on-disk inode root. If the if_broot is currently NULL, then - * if we adding records one will be allocated. The caller must also + * if we are adding records, one will be allocated. The caller must also * not request that the number of records go below zero, although * it can go to zero. * diff --git a/libxfs/xfs_trans_resv.c b/libxfs/xfs_trans_resv.c index 3e14b1c1b..1e59fadec 100644 --- a/libxfs/xfs_trans_resv.c +++ b/libxfs/xfs_trans_resv.c @@ -49,7 +49,7 @@ xfs_calc_buf_res( /* * Logging inodes is really tricksy. They are logged in memory format, - * which means that what we write into the log doesn't directory translate into + * which means that what we write into the log doesn't directly translate into * the amount of space they use on disk. * * Case in point - btree format forks in memory format use more space than the