From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 9A6BA7F51 for ; Thu, 25 Jul 2013 07:58:03 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay3.corp.sgi.com (Postfix) with ESMTP id 3871EAC003 for ; Thu, 25 Jul 2013 05:58:00 -0700 (PDT) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id cvl7E3Q6zBAuWoHE for ; Thu, 25 Jul 2013 05:57:59 -0700 (PDT) Message-ID: <51F12012.4050904@redhat.com> Date: Thu, 25 Jul 2013 08:54:42 -0400 From: Brian Foster MIME-Version: 1.0 Subject: Re: [PATCH 10/49] xfs: sync minor header differences needed by userspace. References: <1374215120-7271-1-git-send-email-david@fromorbit.com> <1374215120-7271-11-git-send-email-david@fromorbit.com> In-Reply-To: <1374215120-7271-11-git-send-email-david@fromorbit.com> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: Dave Chinner Cc: xfs@oss.sgi.com On 07/19/2013 02:24 AM, Dave Chinner wrote: > From: Dave Chinner > > Little things like exported functions, __KERNEL__ protections, and > so on that ensure user and kernel shared headers are identical. > > Signed-off-by: Dave Chinner > --- ... > diff --git a/fs/xfs/xfs_attr_leaf.h b/fs/xfs/xfs_attr_leaf.h > index 444a770..c102213 100644 > --- a/fs/xfs/xfs_attr_leaf.h > +++ b/fs/xfs/xfs_attr_leaf.h > @@ -333,6 +333,8 @@ int xfs_attr3_leaf_read(struct xfs_trans *tp, struct xfs_inode *dp, > struct xfs_buf **bpp); > void xfs_attr3_leaf_hdr_from_disk(struct xfs_attr3_icleaf_hdr *to, > struct xfs_attr_leafblock *from); > +void xfs_attr3_leaf_hdr_to_disk(struct xfs_attr_leafblock *to, > + struct xfs_attr3_icleaf_hdr *from); > I take it this was just missing. > extern const struct xfs_buf_ops xfs_attr3_leaf_buf_ops; > ... > diff --git a/fs/xfs/xfs_dir2_format.h b/fs/xfs/xfs_dir2_format.h > index 7826782..2095e17 100644 > --- a/fs/xfs/xfs_dir2_format.h > +++ b/fs/xfs/xfs_dir2_format.h > @@ -519,6 +519,9 @@ 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); > + This appears in xfs_dir2_priv.h as well. It doesn't cause any compilation problems, but were you intending to duplicate it or move it? > static inline int > xfs_dir3_leaf_hdr_size(struct xfs_dir2_leaf *lp) > { > diff --git a/fs/xfs/xfs_fs.h b/fs/xfs/xfs_fs.h > index d046955..68c2e18 100644 > --- a/fs/xfs/xfs_fs.h > +++ b/fs/xfs/xfs_fs.h > @@ -311,6 +311,17 @@ typedef struct xfs_bstat { > } xfs_bstat_t; > > /* > + * Project quota id helpers (previously projid was 16bit only > + * and using two 16bit values to hold new 32bit projid was choosen > + * to retain compatibility with "old" filesystems). > + */ > +static inline __uint32_t > +bstat_get_projid(struct xfs_bstat *bs) > +{ > + return (__uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo; > +} > + Matches userspace. > +/* > * The user-level BulkStat Request interface structure. > */ > typedef struct xfs_fsop_bulkreq { > @@ -511,8 +522,14 @@ typedef struct xfs_handle { > #define XFS_IOC_ERROR_INJECTION _IOW ('X', 116, struct xfs_error_injection) > #define XFS_IOC_ERROR_CLEARALL _IOW ('X', 117, struct xfs_error_injection) > /* XFS_IOC_ATTRCTL_BY_HANDLE -- deprecated 118 */ > + > /* XFS_IOC_FREEZE -- FIFREEZE 119 */ > /* XFS_IOC_THAW -- FITHAW 120 */ > +#ifndef FIFREEZE > +#define XFS_IOC_FREEZE _IOWR('X', 119, int) > +#define XFS_IOC_THAW _IOWR('X', 120, int) > +#endif > + > #define XFS_IOC_FSSETDM_BY_HANDLE _IOW ('X', 121, struct xfs_fsop_setdm_handlereq) > #define XFS_IOC_ATTRLIST_BY_HANDLE _IOW ('X', 122, struct xfs_fsop_attrlist_handlereq) > #define XFS_IOC_ATTRMULTI_BY_HANDLE _IOW ('X', 123, struct xfs_fsop_attrmulti_handlereq) > diff --git a/fs/xfs/xfs_sb.h b/fs/xfs/xfs_sb.h > index 78f9e70..030f131 100644 > --- a/fs/xfs/xfs_sb.h > +++ b/fs/xfs/xfs_sb.h > @@ -554,6 +554,13 @@ static inline int xfs_sb_version_hasprojid32bit(xfs_sb_t *sbp) > (sbp->sb_features2 & XFS_SB_VERSION2_PROJID32BIT)); > } > > +static inline void xfs_sb_version_addprojid32bit(xfs_sb_t *sbp) > +{ > + sbp->sb_versionnum |= XFS_SB_VERSION_MOREBITSBIT; > + sbp->sb_features2 |= XFS_SB_VERSION2_PROJID32BIT; > + sbp->sb_bad_features2 |= XFS_SB_VERSION2_PROJID32BIT; > +} > + Matches userspace. Reviewed-by: Brian Foster > static inline int xfs_sb_version_hascrc(xfs_sb_t *sbp) > { > return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5; > diff --git a/fs/xfs/xfs_symlink.h b/fs/xfs/xfs_symlink.h > index 3743948..c8e3a02 100644 > --- a/fs/xfs/xfs_symlink.h > +++ b/fs/xfs/xfs_symlink.h > @@ -49,7 +49,8 @@ struct xfs_dsymlink_hdr { > sizeof(struct xfs_dsymlink_hdr) : 0)) > > int xfs_symlink_blocks(struct xfs_mount *mp, int pathlen); > - > +bool xfs_symlink_hdr_ok(struct xfs_mount *mp, xfs_ino_t ino, uint32_t offset, > + uint32_t size, struct xfs_buf *bp); > void xfs_symlink_local_to_remote(struct xfs_trans *tp, struct xfs_buf *bp, > struct xfs_inode *ip, struct xfs_ifork *ifp); > > diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h > index ffaa584..772d5ae 100644 > --- a/fs/xfs/xfs_trans.h > +++ b/fs/xfs/xfs_trans.h > @@ -64,7 +64,7 @@ struct xfs_log_item; > #define XFS_ADDAFORK_LOG_RES(mp) ((mp)->m_reservations.tr_addafork) > #define XFS_ATTRINVAL_LOG_RES(mp) ((mp)->m_reservations.tr_attrinval) > #define XFS_ATTRSETM_LOG_RES(mp) ((mp)->m_reservations.tr_attrsetm) > -#define XFS_ATTRSETRT_LOG_RES(mp) ((mp)->m_reservations.tr_attrsetrt) > +#define XFS_ATTRSETRT_LOG_RES(mp) ((mp)->m_reservations.tr_attrsetrt) > #define XFS_ATTRRM_LOG_RES(mp) ((mp)->m_reservations.tr_attrrm) > #define XFS_CLEAR_AGI_BUCKET_LOG_RES(mp) ((mp)->m_reservations.tr_clearagi) > #define XFS_QM_SBCHANGE_LOG_RES(mp) ((mp)->m_reservations.tr_qm_sbchange) > @@ -325,7 +325,4 @@ extern kmem_zone_t *xfs_log_item_desc_zone; > > #endif /* __KERNEL__ */ > > -void xfs_trans_init(struct xfs_mount *); > -int xfs_trans_roll(struct xfs_trans **, struct xfs_inode *); > - > #endif /* __XFS_TRANS_H__ */ > diff --git a/fs/xfs/xfs_trans_priv.h b/fs/xfs/xfs_trans_priv.h > index 53b7c9b..d43b130 100644 > --- a/fs/xfs/xfs_trans_priv.h > +++ b/fs/xfs/xfs_trans_priv.h > @@ -25,6 +25,9 @@ struct xfs_trans; > struct xfs_ail; > struct xfs_log_vec; > > + > +void xfs_trans_init(struct xfs_mount *); > +int xfs_trans_roll(struct xfs_trans **, struct xfs_inode *); > void xfs_trans_add_item(struct xfs_trans *, struct xfs_log_item *); > void xfs_trans_del_item(struct xfs_log_item *); > void xfs_trans_free_items(struct xfs_trans *tp, xfs_lsn_t commit_lsn, > diff --git a/fs/xfs/xfs_types.h b/fs/xfs/xfs_types.h > index 781772c..6ed6b26 100644 > --- a/fs/xfs/xfs_types.h > +++ b/fs/xfs/xfs_types.h > @@ -32,7 +32,6 @@ typedef unsigned int __uint32_t; > typedef signed long long int __int64_t; > typedef unsigned long long int __uint64_t; > > -typedef __uint32_t prid_t; /* project ID */ > typedef __uint32_t inst_t; /* an instruction */ > > typedef __s64 xfs_off_t; /* type */ > @@ -55,6 +54,8 @@ typedef __uint64_t __psunsigned_t; > > #endif /* __KERNEL__ */ > > +typedef __uint32_t prid_t; /* project ID */ > + > typedef __uint32_t xfs_agblock_t; /* blockno in alloc. group */ > typedef __uint32_t xfs_agino_t; /* inode # within allocation grp */ > typedef __uint32_t xfs_extlen_t; /* extent length in blocks */ > _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs