From 7218b996ad58de21ecd259bb762652f4a972f254 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Fri, 31 May 2002 04:55:57 +0000 Subject: [PATCH] sync with kernel source changes, no affect on userspace. --- include/xfs_da_btree.h | 4 ++-- include/xfs_mount.h | 4 ++-- include/xfs_types.h | 1 - libxfs/xfs.h | 1 + libxfs/xfs_da_btree.c | 24 ++++++++++++------------ libxfs/xfs_rtalloc.c | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/xfs_da_btree.h b/include/xfs_da_btree.h index 706516774..4dfb9d204 100644 --- a/include/xfs_da_btree.h +++ b/include/xfs_da_btree.h @@ -221,8 +221,8 @@ typedef struct xfs_dabuf { inst_t *ra; /* return address of caller to make */ struct xfs_dabuf *next; /* next in global chain */ struct xfs_dabuf *prev; /* previous in global chain */ - dev_t dev; /* device for buffer */ - xfs_daddr_t blkno; /* daddr first in bps[0] */ + kdev_t dev; /* device for buffer */ + xfs_daddr_t blkno; /* daddr first in bps[0] */ #endif struct xfs_buf *bps[1]; /* actually nbuf of these */ } xfs_dabuf_t; diff --git a/include/xfs_mount.h b/include/xfs_mount.h index 3a5383f2b..05379c208 100644 --- a/include/xfs_mount.h +++ b/include/xfs_mount.h @@ -464,7 +464,7 @@ typedef struct xfs_mod_sb { void xfs_mod_sb(xfs_trans_t *, __int64_t); xfs_mount_t *xfs_mount_init(void); void xfs_mount_free(xfs_mount_t *mp, int remove_bhv); -int xfs_mountfs(struct vfs *, xfs_mount_t *mp, dev_t, int); +int xfs_mountfs(struct vfs *, xfs_mount_t *mp, kdev_t, int); int xfs_mountargs(struct mounta *, struct xfs_args *); int xfs_unmountfs(xfs_mount_t *, int, struct cred *); @@ -473,7 +473,7 @@ int xfs_unmountfs_writesb(xfs_mount_t *); int xfs_unmount_flush(xfs_mount_t *, int); int xfs_mod_incore_sb(xfs_mount_t *, xfs_sb_field_t, int, int); int xfs_mod_incore_sb_batch(xfs_mount_t *, xfs_mod_sb_t *, uint, int); -int xfs_readsb(xfs_mount_t *mp, dev_t); +int xfs_readsb(xfs_mount_t *mp); struct xfs_buf *xfs_getsb(xfs_mount_t *, int); void xfs_freesb(xfs_mount_t *); void _xfs_force_shutdown(struct xfs_mount *, int, char *, int); diff --git a/include/xfs_types.h b/include/xfs_types.h index 5174bb66a..79fca50bf 100644 --- a/include/xfs_types.h +++ b/include/xfs_types.h @@ -274,7 +274,6 @@ extern struct xfsstats xfsstats; | (minor&IRIX_DEV_MAXMIN))) #define IRIX_DEV_TO_KDEVT(dev) MKDEV(IRIX_DEV_MAJOR(dev),IRIX_DEV_MINOR(dev)) -#define IRIX_DEV_TO_DEVT(dev) ((IRIX_DEV_MAJOR(dev)<<8)|IRIX_DEV_MINOR(dev)) #ifdef __KERNEL__ /* __psint_t is the same size as a pointer */ diff --git a/libxfs/xfs.h b/libxfs/xfs.h index 10679b9a3..e4f088043 100644 --- a/libxfs/xfs.h +++ b/libxfs/xfs.h @@ -241,6 +241,7 @@ typedef struct { dev_t dev; } buftarg_t; #define ktrace_t void #define m_ddev_targp m_dev #define m_rtdev_targp(m)(&(m)->m_rtdev) +#define kdev_none(x) (!(x)) #define KERN_WARNING #define XFS_ERROR(e) (e) #define XFS_TEST_ERROR(expr,a,b,c) ( expr ) diff --git a/libxfs/xfs_da_btree.c b/libxfs/xfs_da_btree.c index 70f60f7ff..b2a80d299 100644 --- a/libxfs/xfs_da_btree.c +++ b/libxfs/xfs_da_btree.c @@ -2301,7 +2301,7 @@ lock_t xfs_dabuf_global_lock; STATIC xfs_dabuf_t * xfs_da_buf_make(int nbuf, xfs_buf_t **bps, inst_t *ra) { - xfs_buf_t *bp; + xfs_buf_t *bp; xfs_dabuf_t *dabuf; int i; int off; @@ -2313,7 +2313,7 @@ xfs_da_buf_make(int nbuf, xfs_buf_t **bps, inst_t *ra) dabuf->dirty = 0; #ifdef XFS_DABUF_DEBUG dabuf->ra = ra; - dabuf->dev = XFS_BUF_TARGET(bps[0]); + dabuf->dev = XFS_BUF_TARGET_DEV(bps[0]); dabuf->blkno = XFS_BUF_ADDR(bps[0]); #endif if (nbuf == 1) { @@ -2363,8 +2363,8 @@ STATIC void xfs_da_buf_clean(xfs_dabuf_t *dabuf) { xfs_buf_t *bp; - int i; - int off; + int i; + int off; if (dabuf->dirty) { ASSERT(dabuf->nbuf > 1); @@ -2418,10 +2418,10 @@ void xfs_da_log_buf(xfs_trans_t *tp, xfs_dabuf_t *dabuf, uint first, uint last) { xfs_buf_t *bp; - uint f; - int i; - uint l; - int off; + uint f; + int i; + uint l; + int off; ASSERT(dabuf->nbuf && dabuf->data && dabuf->bbcount && dabuf->bps[0]); if (dabuf->nbuf == 1) { @@ -2464,8 +2464,8 @@ xfs_da_brelse(xfs_trans_t *tp, xfs_dabuf_t *dabuf) { xfs_buf_t *bp; xfs_buf_t **bplist; - int i; - int nbuf; + int i; + int nbuf; ASSERT(dabuf->nbuf && dabuf->data && dabuf->bbcount && dabuf->bps[0]); if ((nbuf = dabuf->nbuf) == 1) { @@ -2490,8 +2490,8 @@ xfs_da_binval(xfs_trans_t *tp, xfs_dabuf_t *dabuf) { xfs_buf_t *bp; xfs_buf_t **bplist; - int i; - int nbuf; + int i; + int nbuf; ASSERT(dabuf->nbuf && dabuf->data && dabuf->bbcount && dabuf->bps[0]); if ((nbuf = dabuf->nbuf) == 1) { diff --git a/libxfs/xfs_rtalloc.c b/libxfs/xfs_rtalloc.c index 530ebed7a..9f1c89155 100644 --- a/libxfs/xfs_rtalloc.c +++ b/libxfs/xfs_rtalloc.c @@ -802,7 +802,7 @@ xfs_rtmount_init( sbp = &mp->m_sb; if (sbp->sb_rblocks == 0) return 0; - if (!mp->m_rtdev) { + if (kdev_none(mp->m_rtdev)) { printk(KERN_WARNING "XFS: This FS has an RT subvol - specify -o rtdev on mount\n"); return XFS_ERROR(ENODEV); -- 2.47.2