Commit 3ddb8fa9 authored by Nathan Scott's avatar Nathan Scott
Browse files

[XFS] Sort out cosmetic differences between user and kernel copies of some 


sources.

SGI-PV: 907752
SGI-Modid: xfs-linux-melb:xfs-kern:24659a

Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent a255a745

fs/xfs/xfs_arch.h

+3 −3
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static inline void be64_add(__be64 *a, __s64 b) 
 */ 



#define XFS_GET_DIR_INO4(di) \

	(((u32)(di).i[0] << 24) | ((di).i[1] << 16) | ((di).i[2] << 8) | ((di).i[3]))

	(((__u32)(di).i[0] << 24) | ((di).i[1] << 16) | ((di).i[2] << 8) | ((di).i[3]))



#define XFS_PUT_DIR_INO4(from, di) \

do { \
@@ -213,9 +213,9 @@ do { \ 
} while (0)



#define XFS_DI_HI(di) \

	(((u32)(di).i[1] << 16) | ((di).i[2] << 8) | ((di).i[3]))

	(((__u32)(di).i[1] << 16) | ((di).i[2] << 8) | ((di).i[3]))

#define XFS_DI_LO(di) \

	(((u32)(di).i[4] << 24) | ((di).i[5] << 16) | ((di).i[6] << 8) | ((di).i[7]))

	(((__u32)(di).i[4] << 24) | ((di).i[5] << 16) | ((di).i[6] << 8) | ((di).i[7]))



#define XFS_GET_DIR_INO8(di)        \

	(((xfs_ino_t)XFS_DI_LO(di) & 0xffffffffULL) | \

fs/xfs/xfs_bmap.c

+12 −11
Original line number Diff line number Diff line
@@ -3653,14 +3653,16 @@ xfs_bmap_search_extents( 


	ep = xfs_bmap_do_search_extents(base, lastx, nextents, bno, eofp,

					  lastxp, gotp, prevp);

	rt = ip->i_d.di_flags & XFS_DIFLAG_REALTIME;

	if(!rt && !gotp->br_startblock && (*lastxp != NULLEXTNUM)) {

	rt = (whichfork == XFS_DATA_FORK) && XFS_IS_REALTIME_INODE(ip);

	if (unlikely(!rt && !gotp->br_startblock && (*lastxp != NULLEXTNUM))) {

                cmn_err(CE_PANIC,"Access to block zero: fs: <%s> inode: %lld "

			"start_block : %llx start_off : %llx blkcnt : %llx "

			"extent-state : %x \n",

			(ip->i_mount)->m_fsname, (long long)ip->i_ino,

			gotp->br_startblock, gotp->br_startoff,

			gotp->br_blockcount,gotp->br_state);

			(unsigned long long)gotp->br_startblock,

			(unsigned long long)gotp->br_startoff,

			(unsigned long long)gotp->br_blockcount,

			gotp->br_state);

        }

        return ep;

}
@@ -4883,19 +4885,18 @@ xfs_bmapi( 
					error = xfs_mod_incore_sb(mp,

							XFS_SBS_FDBLOCKS,

							-(indlen), rsvd);

					if (error && rt) {

						xfs_mod_incore_sb(ip->i_mount,

					if (error && rt)

						xfs_mod_incore_sb(mp,

							XFS_SBS_FREXTENTS,

							extsz, rsvd);

					} else if (error) {

						xfs_mod_incore_sb(ip->i_mount,

					else if (error)

						xfs_mod_incore_sb(mp,

							XFS_SBS_FDBLOCKS,

							alen, rsvd);

				}

				}



				if (error) {

					if (XFS_IS_QUOTA_ON(ip->i_mount))

					if (XFS_IS_QUOTA_ON(mp))

						/* unreserve the blocks now */

						(void)

						XFS_TRANS_UNRESERVE_QUOTA_NBLKS(

fs/xfs/xfs_dinode.h

+9 −2
Original line number Diff line number Diff line
@@ -199,10 +199,16 @@ typedef enum xfs_dinode_fmt 


#define XFS_DFORK_DSIZE(dip,mp) \

	XFS_CFORK_DSIZE_DISK(&(dip)->di_core, mp)

#define XFS_DFORK_DSIZE_HOST(dip,mp) \

	XFS_CFORK_DSIZE(&(dip)->di_core, mp)

#define XFS_DFORK_ASIZE(dip,mp) \

	XFS_CFORK_ASIZE_DISK(&(dip)->di_core, mp)

#define XFS_DFORK_ASIZE_HOST(dip,mp) \

	XFS_CFORK_ASIZE(&(dip)->di_core, mp)

#define	XFS_DFORK_SIZE(dip,mp,w) \

	XFS_CFORK_SIZE_DISK(&(dip)->di_core, mp, w)

#define	XFS_DFORK_SIZE_HOST(dip,mp,w) \

	XFS_CFORK_SIZE(&(dip)->di_core, mp, w)



#define	XFS_DFORK_Q(dip)                    XFS_CFORK_Q_DISK(&(dip)->di_core)

#define	XFS_DFORK_BOFF(dip)		    XFS_CFORK_BOFF_DISK(&(dip)->di_core)
@@ -216,6 +222,7 @@ typedef enum xfs_dinode_fmt 
#define	XFS_CFORK_FMT_SET(dcp,w,n) \

	((w) == XFS_DATA_FORK ? \

		((dcp)->di_format = (n)) : ((dcp)->di_aformat = (n)))

#define	XFS_DFORK_FORMAT(dip,w) XFS_CFORK_FORMAT(&(dip)->di_core, w)



#define	XFS_CFORK_NEXTENTS_DISK(dcp,w) \

	((w) == XFS_DATA_FORK ? \
@@ -223,13 +230,13 @@ typedef enum xfs_dinode_fmt 
	 	INT_GET((dcp)->di_anextents, ARCH_CONVERT))

#define XFS_CFORK_NEXTENTS(dcp,w) \

	((w) == XFS_DATA_FORK ? (dcp)->di_nextents : (dcp)->di_anextents)

#define	XFS_DFORK_NEXTENTS(dip,w) XFS_CFORK_NEXTENTS_DISK(&(dip)->di_core, w)

#define	XFS_DFORK_NEXTENTS_HOST(dip,w) XFS_CFORK_NEXTENTS(&(dip)->di_core, w)



#define	XFS_CFORK_NEXT_SET(dcp,w,n) \

	((w) == XFS_DATA_FORK ? \

		((dcp)->di_nextents = (n)) : ((dcp)->di_anextents = (n)))



#define	XFS_DFORK_NEXTENTS(dip,w) XFS_CFORK_NEXTENTS_DISK(&(dip)->di_core, w)



#define	XFS_BUF_TO_DINODE(bp)	((xfs_dinode_t *)XFS_BUF_PTR(bp))



/*

fs/xfs/xfs_dir.h

+2 −0
Original line number Diff line number Diff line
@@ -135,6 +135,8 @@ void xfs_dir_startup(void); /* called exactly once */ 
	((mp)->m_dirops.xd_shortform_to_single(args))



#define	XFS_DIR_IS_V1(mp)	((mp)->m_dirversion == 1)

#define	XFS_DIR_IS_V2(mp)	((mp)->m_dirversion == 2)

extern xfs_dirops_t xfsv1_dirops;

extern xfs_dirops_t xfsv2_dirops;



#endif	/* __XFS_DIR_H__ */

fs/xfs/xfs_dir2.h

+0 −3
Original line number Diff line number Diff line
@@ -72,9 +72,6 @@ typedef struct xfs_dir2_put_args { 
	struct uio	*uio;		/* uio control structure */

} xfs_dir2_put_args_t;



#define	XFS_DIR_IS_V2(mp)	((mp)->m_dirversion == 2)

extern xfs_dirops_t	xfsv2_dirops;



/*

 * Other interfaces used by the rest of the dir v2 code.

 */