With this patch the XFS 1.1 release compiles on x86-64.
All changes were only interrupt flags int -> long. This may benefit some
other architectures too. Some of these changes may be already in
XFS CVS.
-Andi
diff -burp linux-no64/fs/xfs/linux/xfs_vfs.c linux-x86_64/fs/xfs/linux/xfs_vfs.c
--- linux-no64/fs/xfs/linux/xfs_vfs.c Wed May 8 16:52:29 2002
+++ linux-x86_64/fs/xfs/linux/xfs_vfs.c Tue May 7 21:15:25 2002
@@ -86,7 +86,7 @@ STATIC int
vfs_lock_flags(struct vfs *vfsp, int flags)
{
register int error;
- long s;
+ unsigned long s;
spin_lock_irqsave(&vfslock, s);
if (vfsp->vfs_flag & (VFS_MLOCK|VFS_MWANT)) {
@@ -153,7 +153,7 @@ vfs_lock_offline(struct vfs *vfsp)
void
vfs_unlock(register struct vfs *vfsp)
{
- long s;
+ unsigned long s;
spin_lock_irqsave(&vfslock, s);
ASSERT((vfsp->vfs_flag & (VFS_MWANT|VFS_MLOCK)) == VFS_MLOCK);
@@ -176,7 +176,7 @@ vfs_unlock(register struct vfs *vfsp)
int
vfs_busy(struct vfs *vfsp)
{
- long s;
+ unsigned long s;
spin_lock_irqsave(&vfslock, s);
ASSERT((vfsp->vfs_flag & (VFS_MLOCK|VFS_OFFLINE)) != VFS_OFFLINE);
@@ -209,7 +209,7 @@ vfs_busy(struct vfs *vfsp)
struct vfs *
vfs_busydev(dev_t dev, int type)
{
- long s;
+ unsigned long s;
struct vfs *vfsp;
kdev_t kdev = MKDEV(MAJOR(dev), MINOR(dev));
struct super_block *sb;
@@ -296,7 +296,7 @@ vfs_devsearch_nolock(dev_t dev, int fsty
void
vfs_unbusy(struct vfs *vfsp)
{
- long s;
+ unsigned long s;
spin_lock_irqsave(&vfslock, s);
ASSERT(!(vfsp->vfs_flag & (VFS_MLOCK|VFS_OFFLINE)));
@@ -321,7 +321,7 @@ struct vfs *
vfs_devsearch(dev_t dev, int fstype)
{
register struct vfs *vfsp;
- long s;
+ unsigned long s;
spin_lock_irqsave(&vfslock, s);
vfsp = vfs_devsearch_nolock(dev, fstype);
@@ -366,7 +366,7 @@ vfs_insertbhv(
void
vfs_setflag(vfs_t *vfsp, unsigned long f)
{
- long s = mp_mutex_spinlock(&vfslock);
+ unsigned long s = mp_mutex_spinlock(&vfslock);
vfsp->vfs_flag |= f;
mp_mutex_spinunlock(&vfslock, s);
}
diff -burp linux-no64/fs/xfs/linux/xfs_vnode.c
linux-x86_64/fs/xfs/linux/xfs_vnode.c
--- linux-no64/fs/xfs/linux/xfs_vnode.c Wed May 8 16:52:30 2002
+++ linux-x86_64/fs/xfs/linux/xfs_vnode.c Tue May 7 20:08:30 2002
@@ -84,7 +84,8 @@ vn_init(void)
int
vn_reclaim(struct vnode *vp, int flag)
{
- int error, s;
+ int error;
+ unsigned long s;
XFS_STATS_INC(xfsstats.vn_reclaim);
@@ -121,7 +122,7 @@ vn_reclaim(struct vnode *vp, int flag)
STATIC void
vn_wakeup(struct vnode *vp)
{
- int s = VN_LOCK(vp);
+ unsigned long s = VN_LOCK(vp);
if (vp->v_flag & VWAIT) {
sv_broadcast(vptosync(vp));
}
@@ -135,7 +136,7 @@ vn_wait(struct vnode *vp)
NESTED_VN_LOCK(vp);
if (vp->v_flag & (VINACT | VRECLM)) {
- int s;
+ unsigned long s;
local_irq_save(s);
vp->v_flag |= VWAIT;
@@ -170,7 +171,7 @@ struct vnode *
vn_initialize(vfs_t *vfsp, struct inode *inode, int from_readinode)
{
struct vnode *vp;
- int s = 0;
+ unsigned long s = 0;
XFS_STATS_INC(xfsstats.vn_active);
@@ -422,7 +423,7 @@ again:
struct vnode *
vn_hold(struct vnode *vp)
{
- register int s = VN_LOCK(vp);
+ unsigned long s = VN_LOCK(vp);
struct inode *inode;
XFS_STATS_INC(xfsstats.vn_hold);
@@ -453,7 +454,7 @@ vn_rele(struct vnode *vp)
void
vn_put(struct vnode *vp)
{
- int s;
+ unsigned long s;
int vcnt;
/* REFERENCED */
int cache;
diff -burp linux-no64/fs/xfs/linux/xfs_vnode.h
linux-x86_64/fs/xfs/linux/xfs_vnode.h
--- linux-no64/fs/xfs/linux/xfs_vnode.h Wed May 8 16:52:29 2002
+++ linux-x86_64/fs/xfs/linux/xfs_vnode.h Tue May 7 19:19:36 2002
@@ -794,7 +794,7 @@ extern void vn_put(struct vnode *);
static __inline__ void vn_flagset(struct vnode *vp, uint flag)
{
- long flags;
+ unsigned long flags;
spin_lock_irqsave(&vp->v_lock, flags);
vp->v_flag |= flag;
spin_unlock_irqrestore(&vp->v_lock, flags);
@@ -802,7 +802,7 @@ static __inline__ void vn_flagset(struct
static __inline__ void vn_flagclr(struct vnode *vp, uint flag)
{
- long flags;
+ unsigned long flags;
spin_lock_irqsave(&vp->v_lock, flags);
vp->v_flag &= ~flag;
spin_unlock_irqrestore(&vp->v_lock, flags);
diff -burp linux-no64/fs/xfs/xfs_alloc.c linux-x86_64/fs/xfs/xfs_alloc.c
--- linux-no64/fs/xfs/xfs_alloc.c Wed May 8 16:52:29 2002
+++ linux-x86_64/fs/xfs/xfs_alloc.c Tue May 7 19:34:25 2002
@@ -2504,7 +2504,7 @@ xfs_alloc_mark_busy(xfs_trans_t *tp,
xfs_mount_t *mp;
xfs_perag_busy_t *bsy;
int n;
- int s;
+ unsigned long s;
mp = tp->t_mountp;
s = mutex_spinlock(&mp->m_perag[agno].pagb_lock);
@@ -2547,7 +2547,7 @@ xfs_alloc_clear_busy(xfs_trans_t *tp,
{
xfs_mount_t *mp;
xfs_perag_busy_t *list;
- int s;
+ unsigned long s;
mp = tp->t_mountp;
@@ -2581,7 +2581,8 @@ xfs_alloc_search_busy(xfs_trans_t *tp,
int n;
xfs_agblock_t uend, bend;
xfs_lsn_t lsn;
- int cnt, s;
+ int cnt;
+ unsigned long s;
mp = tp->t_mountp;
diff -burp linux-no64/fs/xfs/xfs_bmap.c linux-x86_64/fs/xfs/xfs_bmap.c
--- linux-no64/fs/xfs/xfs_bmap.c Wed May 8 16:52:29 2002
+++ linux-x86_64/fs/xfs/xfs_bmap.c Tue May 7 19:19:36 2002
@@ -3782,7 +3782,7 @@ xfs_bmap_add_attrfork(
xfs_bmap_free_t flist; /* freed extent list */
int logflags; /* logging flags */
xfs_mount_t *mp; /* mount structure */
- int s; /* spinlock spl value */
+ unsigned long s; /* spinlock spl value */
xfs_trans_t *tp; /* transaction pointer */
ASSERT(ip->i_df.if_ext_max ==
diff -burp linux-no64/fs/xfs/xfs_dquot_item.c
linux-x86_64/fs/xfs/xfs_dquot_item.c
--- linux-no64/fs/xfs/xfs_dquot_item.c Wed May 8 16:52:29 2002
+++ linux-x86_64/fs/xfs/xfs_dquot_item.c Tue May 7 19:27:27 2002
@@ -78,7 +78,7 @@ STATIC void
xfs_qm_dquot_logitem_pin(
xfs_dq_logitem_t *logitem)
{
- int s;
+ unsigned long s;
xfs_dquot_t *dqp;
dqp = logitem->qli_dquot;
@@ -97,7 +97,7 @@ STATIC void
xfs_qm_dquot_logitem_unpin(
xfs_dq_logitem_t *logitem)
{
- int s;
+ unsigned long s;
xfs_dquot_t *dqp;
dqp = logitem->qli_dquot;
@@ -171,7 +171,7 @@ void
xfs_qm_dqunpin_wait(
xfs_dquot_t *dqp)
{
- int s;
+ unsigned long s;
ASSERT(XFS_DQ_IS_LOCKED(dqp));
if (dqp->q_pincount == 0) {
diff -burp linux-no64/fs/xfs/xfs_fsops.c linux-x86_64/fs/xfs/xfs_fsops.c
--- linux-no64/fs/xfs/xfs_fsops.c Wed May 8 16:52:29 2002
+++ linux-x86_64/fs/xfs/xfs_fsops.c Tue May 7 19:19:36 2002
@@ -438,7 +438,7 @@ xfs_fs_counts(
xfs_mount_t *mp,
xfs_fsop_counts_t *cnt)
{
- int s;
+ unsigned long s;
s = XFS_SB_LOCK(mp);
cnt->freedata = mp->m_sb.sb_fdblocks;
@@ -472,7 +472,7 @@ xfs_reserve_blocks(
{
__uint64_t lcounter, delta;
__uint64_t request;
- int s;
+ unsigned long s;
/* If inval is null, report current values and return */
diff -burp linux-no64/fs/xfs/xfs_inode.c linux-x86_64/fs/xfs/xfs_inode.c
--- linux-no64/fs/xfs/xfs_inode.c Wed May 8 16:52:29 2002
+++ linux-x86_64/fs/xfs/xfs_inode.c Tue May 7 19:37:10 2002
@@ -2560,7 +2560,7 @@ void
xfs_ipin(
xfs_inode_t *ip)
{
- int s;
+ unsigned long s;
ASSERT(ismrlocked(&ip->i_lock, MR_UPDATE));
@@ -2578,7 +2578,7 @@ void
xfs_iunpin(
xfs_inode_t *ip)
{
- int s;
+ unsigned long s;
ASSERT(ip->i_pincount > 0);
@@ -2598,7 +2598,7 @@ unsigned int
xfs_ipincount(
xfs_inode_t *ip)
{
- int s;
+ unsigned long s;
unsigned int cnt;
s = mutex_spinlock(&ip->i_ipinlock);
@@ -2623,7 +2623,7 @@ void
xfs_iunpin_wait(
xfs_inode_t *ip)
{
- int s;
+ unsigned long s;
xfs_inode_log_item_t *iip;
xfs_lsn_t lsn;
diff -burp linux-no64/fs/xfs/xfs_log.c linux-x86_64/fs/xfs/xfs_log.c
--- linux-no64/fs/xfs/xfs_log.c Wed May 8 16:52:30 2002
+++ linux-x86_64/fs/xfs/xfs_log.c Tue May 7 19:44:08 2002
@@ -561,7 +561,7 @@ xfs_log_unmount_write(xfs_mount_t *mp)
xfs_log_ticket_t tic = 0;
xfs_lsn_t lsn;
int error;
- int spl;
+ unsigned long spl;
/* the data section must be 32 bit size aligned */
struct {
@@ -722,7 +722,8 @@ xfs_log_move_tail(xfs_mount_t *mp,
{
xlog_ticket_t *tic;
xlog_t *log = mp->m_log;
- int need_bytes, free_bytes, cycle, bytes, spl;
+ int need_bytes, free_bytes, cycle, bytes;
+ unsigned long spl;
#if defined(DEBUG) || defined(XLOG_NOLOG)
if (!xlog_debug && xlog_devt == log->l_dev)
@@ -798,7 +799,8 @@ xfs_log_move_tail(xfs_mount_t *mp,
int
xfs_log_need_covered(xfs_mount_t *mp)
{
- int spl, needed = 0, gen;
+ int needed = 0, gen;
+ unsigned long spl;
xlog_t *log = mp->m_log;
if (mp->m_frozen || XFS_FORCED_SHUTDOWN(mp))
@@ -842,7 +844,7 @@ xfs_lsn_t
xlog_assign_tail_lsn(xfs_mount_t *mp, xlog_in_core_t *iclog)
{
xfs_lsn_t tail_lsn;
- int spl;
+ unsigned long spl;
xlog_t *log = mp->m_log;
tail_lsn = xfs_trans_tail_ail(mp);
@@ -1260,7 +1262,7 @@ xlog_grant_push_ail(xfs_mount_t *mp,
int free_bytes; /* free bytes left to write to
*/
int threshold_block; /* block in lsn we'd like to be
at */
int threshold_cycle; /* lsn cycle we'd like to be at
*/
- int spl;
+ unsigned long spl;
int free_threshold;
ASSERT(BTOBB(need_bytes) < log->l_logBBsize);
@@ -1859,7 +1861,7 @@ xlog_state_do_callback(
xlog_in_core_t *first_iclog; /* used to know when we've
* processed all iclogs once */
xfs_log_callback_t *cb, *cb_next;
- int spl;
+ unsigned long spl;
int flushcnt = 0;
xfs_lsn_t lowest_lsn;
int ioerrors; /* counter: iclogs with errors */
@@ -2074,7 +2076,7 @@ xlog_state_done_syncing(
xlog_in_core_t *iclog,
int aborted)
{
- int spl;
+ unsigned long spl;
xlog_t *log = iclog->ic_log;
spl = LOG_LOCK(log);
@@ -2121,7 +2123,7 @@ xlog_state_finish_copy(xlog_t *log,
int first_write,
int copy_bytes)
{
- int spl;
+ unsigned long spl;
spl = LOG_LOCK(log);
@@ -2163,7 +2165,7 @@ xlog_state_get_iclog_space(xlog_t *log
int *continued_write,
int *logoffsetp)
{
- int spl;
+ unsigned long spl;
int log_offset;
xlog_rec_header_t *head;
xlog_in_core_t *iclog;
@@ -2269,7 +2271,7 @@ xlog_grant_log_space(xlog_t *log,
{
int free_bytes;
int need_bytes;
- int spl;
+ unsigned long spl;
#ifdef DEBUG
xfs_lsn_t tail_lsn;
#endif
@@ -2384,7 +2386,7 @@ STATIC int
xlog_regrant_write_log_space(xlog_t *log,
xlog_ticket_t *tic)
{
- int spl;
+ unsigned long spl;
int free_bytes, need_bytes;
xlog_ticket_t *ntic;
#ifdef DEBUG
@@ -2521,7 +2523,7 @@ STATIC void
xlog_regrant_reserve_log_space(xlog_t *log,
xlog_ticket_t *ticket)
{
- int spl;
+ unsigned long spl;
xlog_trace_loggrant(log, ticket,
"xlog_regrant_reserve_log_space: enter");
@@ -2569,7 +2571,7 @@ STATIC void
xlog_ungrant_log_space(xlog_t *log,
xlog_ticket_t *ticket)
{
- int spl;
+ unsigned long spl;
if (ticket->t_cnt > 0)
ticket->t_cnt--;
@@ -2611,7 +2613,7 @@ xlog_state_lsn_is_synced(xlog_t *lo
int *abortflg)
{
xlog_in_core_t *iclog;
- int spl;
+ unsigned long spl;
int lsn_is_synced = 1;
*abortflg = 0;
@@ -2651,7 +2653,7 @@ void
xlog_state_put_ticket(xlog_t *log,
xlog_ticket_t *tic)
{
- int spl;
+ unsigned long spl;
spl = LOG_LOCK(log);
xlog_ticket_put(log, tic);
@@ -2672,7 +2674,7 @@ int
xlog_state_release_iclog(xlog_t *log,
xlog_in_core_t *iclog)
{
- int spl;
+ unsigned long spl;
int sync = 0; /* do we sync? */
xlog_assign_tail_lsn(log->l_mp, 0);
@@ -2780,7 +2782,7 @@ xlog_state_sync_all(xlog_t *log, uint fl
{
xlog_in_core_t *iclog;
xfs_lsn_t lsn;
- int spl;
+ unsigned long spl;
spl = LOG_LOCK(log);
@@ -2897,7 +2899,7 @@ xlog_state_sync(xlog_t *log,
uint flags)
{
xlog_in_core_t *iclog;
- int spl;
+ unsigned long spl;
int already_slept = 0;
@@ -2996,7 +2998,7 @@ try_again:
void
xlog_state_want_sync(xlog_t *log, xlog_in_core_t *iclog)
{
- int spl;
+ unsigned long spl;
spl = LOG_LOCK(log);
@@ -3028,7 +3030,7 @@ xlog_state_ticket_alloc(xlog_t *log)
xlog_ticket_t *t_list;
xlog_ticket_t *next;
xfs_caddr_t buf;
- int spl;
+ unsigned long spl;
uint i = (NBPP / sizeof(xlog_ticket_t)) - 2;
/*
@@ -3116,7 +3118,7 @@ xlog_ticket_get(xlog_t *log,
uint xflags)
{
xlog_ticket_t *tic;
- int spl;
+ unsigned long spl;
alloc:
if (log->l_freelist == NULL)
@@ -3289,7 +3291,8 @@ xlog_verify_iclog(xlog_t *log,
xfs_caddr_t base_ptr;
__psint_t field_offset;
__uint8_t clientid;
- int len, i, op_len, spl;
+ int len, i, op_len;
+ unsigned long spl;
int idx;
/* check validity of iclog pointers */
@@ -3400,7 +3403,7 @@ xfs_log_force_umount(
int logerror)
{
xlog_ticket_t *tic;
- int spl, spl2;
+ unsigned long spl, spl2;
xlog_t *log;
int retval;
diff -burp linux-no64/fs/xfs/xfs_mount.c linux-x86_64/fs/xfs/xfs_mount.c
--- linux-no64/fs/xfs/xfs_mount.c Wed May 8 16:52:30 2002
+++ linux-x86_64/fs/xfs/xfs_mount.c Tue May 7 19:46:23 2002
@@ -1433,7 +1433,7 @@ xfs_mod_incore_sb_unlocked(xfs_mount_t *
int
xfs_mod_incore_sb(xfs_mount_t *mp, xfs_sb_field_t field, int delta, int rsvd)
{
- int s;
+ unsigned long s;
int status;
s = XFS_SB_LOCK(mp);
@@ -1456,7 +1456,7 @@ xfs_mod_incore_sb(xfs_mount_t *mp, xfs_s
int
xfs_mod_incore_sb_batch(xfs_mount_t *mp, xfs_mod_sb_t *msb, uint nmsb, int
rsvd)
{
- int s;
+ unsigned long s;
int status=0;
xfs_mod_sb_t *msbp;
@@ -1623,7 +1623,7 @@ xfs_mount_reset_sbqflags(
xfs_mount_t *mp)
{
xfs_trans_t *tp;
- int s;
+ unsigned long s;
mp->m_qflags = 0;
/*
@@ -1687,7 +1687,7 @@ xfs_start_freeze(
xfs_mount_t *mp,
int level)
{
- int s = mutex_spinlock(&mp->m_freeze_lock);
+ unsigned long s = mutex_spinlock(&mp->m_freeze_lock);
mp->m_frozen = level;
mutex_spinunlock(&mp->m_freeze_lock, s);
@@ -1702,7 +1702,7 @@ void
xfs_finish_freeze(
xfs_mount_t *mp)
{
- int s = mutex_spinlock(&mp->m_freeze_lock);
+ unsigned long s = mutex_spinlock(&mp->m_freeze_lock);
if (mp->m_frozen) {
mp->m_frozen = 0;
@@ -1719,7 +1719,7 @@ xfs_check_frozen(
int ioflag,
int level)
{
- int s;
+ unsigned long s;
int do_lock = 0;
if (!mp->m_frozen) {
diff -burp linux-no64/fs/xfs/xfs_mount.h linux-x86_64/fs/xfs/xfs_mount.h
--- linux-no64/fs/xfs/xfs_mount.h Wed May 8 16:52:30 2002
+++ linux-x86_64/fs/xfs/xfs_mount.h Tue May 7 19:24:50 2002
@@ -82,7 +82,7 @@ struct xfs_dio;
struct xfs_bmbt_irec;
struct xfs_bmap_free;
-#define SPLDECL(s) int s
+#define SPLDECL(s) unsigned long s
#define AIL_LOCK_T lock_t
#define AIL_LOCKINIT(x,y) spinlock_init(x,y)
#define AIL_LOCK_DESTROY(x) spinlock_destroy(x)
Only in linux-x86_64/fs/xfs: xfs_mount.h-o
diff -burp linux-no64/fs/xfs/xfs_qm.c linux-x86_64/fs/xfs/xfs_qm.c
--- linux-no64/fs/xfs/xfs_qm.c Wed May 8 16:52:30 2002
+++ linux-x86_64/fs/xfs/xfs_qm.c Tue May 7 19:19:36 2002
@@ -323,7 +323,7 @@ int
xfs_qm_mount_quotas(
xfs_mount_t *mp)
{
- int s;
+ unsigned long s;
int error;
uint sbf;
@@ -1438,7 +1438,8 @@ xfs_qm_qino_alloc(
uint flags)
{
xfs_trans_t *tp;
- int error, s;
+ int error;
+ unsigned long s;
cred_t zerocr;
int committed;
Only in linux-x86_64/fs/xfs: xfs_qm.c-XFS64
diff -burp linux-no64/fs/xfs/xfs_qm_syscalls.c
linux-x86_64/fs/xfs/xfs_qm_syscalls.c
--- linux-no64/fs/xfs/xfs_qm_syscalls.c Wed May 8 16:52:30 2002
+++ linux-x86_64/fs/xfs/xfs_qm_syscalls.c Tue May 7 19:19:36 2002
@@ -162,7 +162,7 @@ xfs_qm_scall_quotaoff(
boolean_t force)
{
uint dqtype;
- int s;
+ unsigned long s;
int error;
uint inactivate_flags;
xfs_qoff_logitem_t *qoffstart;
@@ -410,7 +410,8 @@ xfs_qm_scall_quotaon(
xfs_mount_t *mp,
uint flags)
{
- int error, s;
+ int error;
+ unsigned long s;
uint qf;
uint accflags;
__int64_t sbflags;
@@ -813,7 +814,8 @@ xfs_qm_log_quotaoff(
uint flags)
{
xfs_trans_t *tp;
- int error, s;
+ int error;
+ unsigned long s;
xfs_qoff_logitem_t *qoffi=NULL;
uint oldsbqflag=0;
Only in linux-x86_64/fs/xfs: xfs_qm_syscalls.c-XFS64
diff -burp linux-no64/fs/xfs/xfs_trans_ail.c linux-x86_64/fs/xfs/xfs_trans_ail.c
--- linux-no64/fs/xfs/xfs_trans_ail.c Wed May 8 16:52:30 2002
+++ linux-x86_64/fs/xfs/xfs_trans_ail.c Tue May 7 20:01:17 2002
@@ -281,7 +281,7 @@ xfs_trans_update_ail(
xfs_mount_t *mp,
xfs_log_item_t *lip,
xfs_lsn_t lsn,
- int s)
+ unsigned long s)
{
xfs_ail_entry_t *ailp;
xfs_log_item_t *dlip=NULL;
@@ -333,7 +333,7 @@ void
xfs_trans_delete_ail(
xfs_mount_t *mp,
xfs_log_item_t *lip,
- int s)
+ unsigned long s)
{
xfs_ail_entry_t *ailp;
xfs_log_item_t *dlip;
diff -burp linux-no64/fs/xfs/xfs_trans_priv.h
linux-x86_64/fs/xfs/xfs_trans_priv.h
--- linux-no64/fs/xfs/xfs_trans_priv.h Wed May 8 16:52:30 2002
+++ linux-x86_64/fs/xfs/xfs_trans_priv.h Tue May 7 20:02:36 2002
@@ -61,9 +61,10 @@ xfs_log_busy_slot_t *xfs_trans_add_busy
* From xfs_trans_ail.c
*/
void xfs_trans_update_ail(struct xfs_mount *,
- struct xfs_log_item *, xfs_lsn_t, int);
+ struct xfs_log_item *, xfs_lsn_t,
+ unsigned long);
void xfs_trans_delete_ail(struct xfs_mount *,
- struct xfs_log_item *, int);
+ struct xfs_log_item *, unsigned long);
struct xfs_log_item *xfs_trans_first_ail(struct xfs_mount *, int *);
struct xfs_log_item *xfs_trans_next_ail(struct xfs_mount *,
struct xfs_log_item *, int *, int *);
diff -burp linux-no64/fs/xfs/xfs_utils.c linux-x86_64/fs/xfs/xfs_utils.c
--- linux-no64/fs/xfs/xfs_utils.c Wed May 8 16:52:30 2002
+++ linux-x86_64/fs/xfs/xfs_utils.c Tue May 7 19:19:36 2002
@@ -480,7 +480,7 @@ xfs_bump_ino_vers2(
xfs_inode_t *ip)
{
xfs_mount_t *mp;
- int s;
+ unsigned long s;
ASSERT(ismrlocked (&ip->i_lock, MR_UPDATE));
ASSERT(ip->i_d.di_version == XFS_DINODE_VERSION_1);
Only in linux-x86_64/fs/xfs: xfs_utils.c-XFS64
diff -burp linux-no64/fs/xfs/xfs_vfsops.c linux-x86_64/fs/xfs/xfs_vfsops.c
--- linux-no64/fs/xfs/xfs_vfsops.c Wed May 8 16:52:30 2002
+++ linux-x86_64/fs/xfs/xfs_vfsops.c Tue May 7 19:19:36 2002
@@ -855,7 +855,7 @@ xfs_statvfs(
xfs_extlen_t lsize;
xfs_mount_t *mp;
xfs_sb_t *sbp;
- int s;
+ unsigned long s;
mp = XFS_BHVTOM(bdp);
sbp = &(mp->m_sb);
Only in linux-x86_64/fs/xfs: xfs_vfsops.c-XFS64
diff -burp linux-no64/fs/xfs_dmapi/dmapi_private.h
linux-x86_64/fs/xfs_dmapi/dmapi_private.h
--- linux-no64/fs/xfs_dmapi/dmapi_private.h Wed May 8 16:52:30 2002
+++ linux-x86_64/fs/xfs_dmapi/dmapi_private.h Tue May 7 20:19:43 2002
@@ -299,13 +299,13 @@ extern lock_t dm_reg_lock; /* lock
for
int dm_find_session_and_lock(
dm_sessid_t sid,
dm_session_t **sessionpp,
- int *lcp);
+ unsigned long *lcp);
int dm_find_msg_and_lock(
dm_sessid_t sid,
dm_token_t token,
dm_tokevent_t **tevpp,
- int *lcp);
+ unsigned long *lcp);
dm_tokevent_t * dm_evt_create_tevp(
dm_eventtype_t event,
@@ -461,7 +461,7 @@ int dm_waitfor_disp_session(
vfs_t *vfsp,
dm_tokevent_t *tevp,
dm_session_t **sessionpp,
- int *lcp);
+ unsigned long *lcp);
vnode_t * dm_handle_to_vp (
xfs_handle_t *handlep,
@@ -472,7 +472,7 @@ int dm_check_dmapi_vp(
dm_tokevent_t * dm_find_mount_tevp_and_lock(
fsid_t *fsidp,
- int *lcp);
+ unsigned long *lcp);
int dm_path_to_hdl(
char *path,
Only in linux-x86_64/fs/xfs_dmapi: dmapi_private.h-o
diff -burp linux-no64/fs/xfs_dmapi/dmapi_register.c
linux-x86_64/fs/xfs_dmapi/dmapi_register.c
--- linux-no64/fs/xfs_dmapi/dmapi_register.c Wed May 8 16:52:30 2002
+++ linux-x86_64/fs/xfs_dmapi/dmapi_register.c Tue May 7 20:21:28 2002
@@ -151,7 +151,7 @@ dm_find_fsreg(
static dm_fsreg_t *
dm_find_fsreg_and_lock(
fsid_t *fsidp,
- int *lcp) /* address of returned lock cookie */
+ unsigned long *lcp) /* address of returned lock cookie */
{
dm_fsreg_t *fsrp;
@@ -192,7 +192,7 @@ dm_add_fsys_entry(
dm_fsreg_t *fsrp;
int msgsize;
void *msg;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
/* Allocate and initialize a dm_fsreg_t structure for the filesystem. */
@@ -266,7 +266,7 @@ dm_change_fsys_entry(
{
dm_fsreg_t *fsrp;
int seq_error;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
/* Find the filesystem referenced by the vfsp's fsid_t. This should
always succeed.
@@ -357,7 +357,7 @@ dm_remove_fsys_entry(
{
dm_fsreg_t **fsrpp;
dm_fsreg_t *fsrp;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
/* Find the filesystem referenced by the vfsp's fsid_t and dequeue
it after verifying that the fr_state shows a filesystem that is
@@ -459,7 +459,7 @@ dm_handle_to_vp(
dm_fsreg_t *fsrp;
vnode_t *vp;
short type;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
int error;
fid_t *fidp;
@@ -566,7 +566,7 @@ dm_check_dmapi_vp(
/* REFERENCED */
dm_fsreg_t *fsrp;
int error;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
if ((error = dm_vp_to_handle(vp, &handle)) != 0)
return(error);
@@ -587,7 +587,7 @@ dm_check_dmapi_vp(
dm_tokevent_t *
dm_find_mount_tevp_and_lock(
fsid_t *fsidp,
- int *lcp) /* address of returned lock cookie */
+ unsigned long *lcp) /* address of returned lock cookie */
{
dm_fsreg_t *fsrp;
@@ -620,9 +620,9 @@ dm_waitfor_disp(
vfs_t *vfsp,
dm_tokevent_t *tevp,
dm_fsreg_t **fsrpp,
- int *lc1p, /* addr of first returned lock cookie */
+ unsigned long *lc1p, /* addr of first returned lock cookie */
dm_session_t **sessionpp,
- int *lc2p) /* addr of 2nd returned lock cookie */
+ unsigned long *lc2p) /* addr of 2nd returned lock cookie */
{
dm_eventtype_t event = tevp->te_msg.ev_type;
dm_session_t *s;
@@ -695,7 +695,7 @@ dm_waitfor_disp_session(
vfs_t *vfsp,
dm_tokevent_t *tevp,
dm_session_t **sessionpp,
- int *lcp)
+ unsigned long *lcp)
{
dm_fsreg_t *fsrp;
int lc2;
@@ -726,8 +726,8 @@ dm_waitfor_destroy_attrname(
dm_session_t *s;
dm_fsreg_t *fsrp;
int error;
- int lc1; /* first lock cookie */
- int lc2; /* second lock cookie */
+ unsigned long lc1; /* first lock cookie */
+ unsigned long lc2; /* second lock cookie */
void *msgp;
tevp = dm_evt_create_tevp(DM_EVENT_DESTROY, 1, (void**)&msgp);
@@ -757,7 +757,7 @@ dm_clear_fsreg(
{
dm_fsreg_t *fsrp;
int event;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
lc = mutex_spinlock(&dm_reg_lock);
@@ -793,7 +793,7 @@ dm_path_to_hdl(
vnode_t *vp;
size_t hlen;
int error;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
struct nameidata nd;
struct inode *inode;
size_t len;
@@ -858,7 +858,7 @@ dm_path_to_fshdl(
vnode_t *vp;
size_t hlen;
int error;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
struct nameidata nd;
struct inode *inode;
size_t len;
@@ -919,7 +919,7 @@ dm_fd_to_hdl(
xfs_handle_t handle;
size_t hlen;
int error;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
struct file *filep = fget(fd);
if (!filep)
@@ -1047,8 +1047,8 @@ dm_set_disp(
dm_tokdata_t *tdp;
dm_eventset_t eventset;
int error;
- int lc1; /* first lock cookie */
- int lc2; /* second lock cookie */
+ unsigned long lc1; /* first lock cookie */
+ unsigned long lc2; /* second lock cookie */
u_int i;
/* Copy in and validate the event mask. Only the lower maxevent bits
@@ -1176,8 +1176,8 @@ dm_set_return_on_destroy(
dm_fsreg_t *fsrp;
dm_session_t *s;
int error;
- int lc1; /* first lock cookie */
- int lc2; /* second lock cookie */
+ unsigned long lc1; /* first lock cookie */
+ unsigned long lc2; /* second lock cookie */
/* If a dm_attrname_t is provided, copy it in and validate it. */
@@ -1247,7 +1247,7 @@ dm_get_mountinfo(
dm_fsreg_t *fsrp;
dm_tokdata_t *tdp;
int error;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
/* Make sure that the caller's buffer is 8-byte aligned. */
@@ -1301,8 +1301,8 @@ dm_getall_disp(
size_t *rlenp)
{
dm_session_t *s; /* pointer to session given by sid */
- int lc1; /* first lock cookie */
- int lc2; /* second lock cookie */
+ unsigned long lc1; /* first lock cookie */
+ unsigned long lc2; /* second lock cookie */
int totalsize;
int msgsize;
int fsyscnt;
Only in linux-x86_64/fs/xfs_dmapi: dmapi_register.c-o
diff -burp linux-no64/fs/xfs_dmapi/dmapi_right.c
linux-x86_64/fs/xfs_dmapi/dmapi_right.c
--- linux-no64/fs/xfs_dmapi/dmapi_right.c Wed May 8 16:52:30 2002
+++ linux-x86_64/fs/xfs_dmapi/dmapi_right.c Tue May 7 20:28:47 2002
@@ -205,7 +205,7 @@ static int
dm_app_lookup_tdp(
xfs_handle_t *handlep, /* the handle we are looking for */
dm_tokevent_t *tevp, /* the event to search for the handle */
- int *lcp, /* address of active lock cookie */
+ unsigned long *lcp, /* address of active lock cookie */
short types, /* acceptable object types */
dm_right_t right, /* minimum right the object must have */
u_int flags,
@@ -426,7 +426,7 @@ dm_app_get_tdp_by_token(
dm_tokevent_t *tevp;
xfs_handle_t handle;
int error;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
if (right < DM_RIGHT_NULL || right > DM_RIGHT_EXCL)
return(EINVAL);
@@ -477,7 +477,7 @@ dm_app_get_tdp(
xfs_handle_t handle;
dm_tokevent_t *tevp;
int error;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
ASSERT(right >= DM_RIGHT_SHARED);
@@ -531,7 +531,7 @@ dm_get_config_tdp(
xfs_handle_t handle;
dm_tokevent_t *tevp;
int error;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
if ((error = dm_copyin_handle(hanp, hlen, &handle)) != 0)
return(error);
@@ -637,7 +637,7 @@ dm_put_tevp(
dm_tokdata_t *tdp)
{
int free_tdp = 0;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
lc = mutex_spinlock(&tevp->te_lock);
@@ -865,7 +865,7 @@ dm_evt_rele_tevp(
int droprights) /* non-zero, evt thread loses rights */
{
dm_tokdata_t *tdp;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
lc = mutex_spinlock(&tevp->te_lock);
Only in linux-x86_64/fs/xfs_dmapi: dmapi_right.c-o
diff -burp linux-no64/fs/xfs_dmapi/dmapi_session.c
linux-x86_64/fs/xfs_dmapi/dmapi_session.c
--- linux-no64/fs/xfs_dmapi/dmapi_session.c Wed May 8 16:52:30 2002
+++ linux-x86_64/fs/xfs_dmapi/dmapi_session.c Tue May 7 20:53:29 2002
@@ -446,7 +446,7 @@ int
dm_find_session_and_lock(
dm_sessid_t sid,
dm_session_t **sessionpp,
- int *lcp) /* addr of returned lock cookie */
+ unsigned long *lcp) /* addr of returned lock cookie */
{
int error;
@@ -511,7 +511,7 @@ dm_find_msg_and_lock(
dm_sessid_t sid,
dm_token_t token,
dm_tokevent_t **tevpp,
- int *lcp) /* address of returned lock cookie */
+ unsigned long *lcp) /* address of returned lock cookie */
{
dm_session_t *s;
int error;
@@ -542,7 +542,7 @@ dm_create_session(
char sessinfo[DM_SESSION_INFO_LEN];
size_t len;
int error;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
len = strnlen_user(info, DM_SESSION_INFO_LEN-1);
if (copy_from_user(sessinfo, info, len))
@@ -599,7 +599,7 @@ dm_destroy_session(
{
dm_session_t *s;
int error;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
/* The dm_session_lock must be held until the session is unlinked. */
@@ -668,7 +668,7 @@ dm_getall_sessions(
dm_session_t *s;
u_int sesscnt;
dm_sessid_t *sesslist;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
int error;
int i;
@@ -731,7 +731,7 @@ dm_query_session(
int len; /* length of session info string */
int error;
char sessinfo[DM_SESSION_INFO_LEN];
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
if ((error = dm_find_session_and_lock(sid, &s, &lc)) != 0)
return(error);
@@ -770,7 +770,7 @@ dm_getall_tokens(
{
dm_session_t *s; /* pointer to session given by sid */
dm_tokevent_t *tevp; /* event message queue traversal */
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
int tokcnt;
dm_token_t *toklist;
int error;
@@ -846,7 +846,7 @@ dm_find_eventmsg(
int msgsize; /* size of message to copy out */
void *msg;
int error;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
/* Because some of the events (dm_data_event_t in particular) contain
__u64 fields, we need to make sure that the buffer provided by the
@@ -904,7 +904,7 @@ dm_move_event(
dm_session_t *s2;
dm_tokevent_t *tevp;
int error;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
#ifdef __sgi
int hash_it;
#endif
@@ -946,7 +946,7 @@ dm_pending(
{
dm_tokevent_t *tevp;
int error;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
if ((error = dm_find_msg_and_lock(sid, token, &tevp, &lc)) != 0)
return(error);
@@ -972,8 +972,8 @@ dm_get_events(
dm_session_t *s; /* pointer to session given by sid */
dm_tokevent_t *tevp; /* next event message on queue */
int error;
- int lc1; /* first lock cookie */
- int lc2 = 0; /* second lock cookie */
+ unsigned long lc1; /* first lock cookie */
+ unsigned long lc2 = 0; /* second lock cookie */
int totalsize;
int msgsize;
dm_eventmsg_t *prevmsg;
@@ -1180,7 +1180,7 @@ dm_respond_event(
dm_session_t *s; /* pointer to session given by sid */
dm_tokevent_t *tevp; /* event message queue traversal */
int error;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
/* Sanity check the input parameters. */
@@ -1252,7 +1252,7 @@ dm_respond_event(
static int
dm_enqueue(
dm_session_t *s,
- int lc, /* input lock cookie */
+ unsigned long lc, /* input lock cookie */
dm_tokevent_t *tevp, /* in/out parameter */
int sync,
int flags,
@@ -1400,7 +1400,7 @@ dm_enqueue_normal_event(
dm_session_t *s;
int error;
int sync;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
switch (tevp->te_msg.ev_type) {
case DM_EVENT_READ:
@@ -1469,7 +1469,7 @@ dm_enqueue_mount_event(
dm_session_t *s;
dm_sessid_t sid;
int error;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
/* Make the mounting filesystem visible to other DMAPI calls. */
@@ -1520,7 +1520,7 @@ dm_enqueue_sendmsg_event(
{
dm_session_t *s;
int error;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
if ((error = dm_find_session_and_lock(targetsid, &s, &lc)) != 0)
return(error);
@@ -1537,7 +1537,7 @@ dm_enqueue_user_event(
{
dm_session_t *s;
int error;
- int lc; /* lock cookie */
+ unsigned long lc; /* lock cookie */
/* Atomically find and lock the session whose session id is 'sid'. */
diff -burp linux-no64/fs/xfs_dmapi/xfsjunk.c linux-x86_64/fs/xfs_dmapi/xfsjunk.c
--- linux-no64/fs/xfs_dmapi/xfsjunk.c Wed May 8 16:52:30 2002
+++ linux-x86_64/fs/xfs_dmapi/xfsjunk.c Tue May 7 20:10:44 2002
@@ -6,7 +6,7 @@
struct vnode *
vn_hold(struct vnode *vp)
{
- register int s = VN_LOCK(vp);
+ unsigned long s = VN_LOCK(vp);
struct inode *inode;
/* XFS_STATS_INC(xfsstats.vn_hold);*/
diff -burp linux-no64/fs/xfs_support/mrlock.c
linux-x86_64/fs/xfs_support/mrlock.c
--- linux-no64/fs/xfs_support/mrlock.c Wed May 8 16:52:30 2002
+++ linux-x86_64/fs/xfs_support/mrlock.c Tue May 7 20:54:39 2002
@@ -170,7 +170,7 @@ mrupdatef(mrlock_t *mrp, int flags)
int
mrtryaccess(mrlock_t *mrp)
{
- long s;
+ unsigned long s;
MRLOCK_INT(mrp, s);
/*
@@ -189,7 +189,7 @@ mrtryaccess(mrlock_t *mrp)
int
mrtrypromote(mrlock_t *mrp)
{
- long s;
+ unsigned long s;
MRLOCK_INT(mrp, s);
@@ -206,7 +206,7 @@ mrtrypromote(mrlock_t *mrp)
int
mrtryupdate(mrlock_t *mrp)
{
- long s;
+ unsigned long s;
MRLOCK_INT(mrp, s);
@@ -248,7 +248,7 @@ mraccunlock(mrlock_t *mrp)
void
mrunlock(mrlock_t *mrp)
{
- long s;
+ unsigned long s;
MRLOCK_INT(mrp, s);
if (mrp->mr_count < 0) {
Only in linux-x86_64/fs/xfs_support: mrlock.c-o
diff -burp linux-no64/fs/xfs_support/sv.c linux-x86_64/fs/xfs_support/sv.c
--- linux-no64/fs/xfs_support/sv.c Wed May 8 16:52:30 2002
+++ linux-x86_64/fs/xfs_support/sv.c Tue May 7 19:27:59 2002
@@ -47,7 +47,7 @@ void _sv_init( sv_t *sv)
spin_lock_init(&sv->lock);
}
-void _sv_wait( sv_t *sv, spinlock_t *lock, int spl, int intr, struct timespec
*timeout)
+void _sv_wait( sv_t *sv, spinlock_t *lock, unsigned long spl, int intr, struct
timespec *timeout)
{
DECLARE_WAITQUEUE( wait, current );
diff -burp linux-no64/include/linux/xfs_support/mutex.h
linux-x86_64/include/linux/xfs_support/mutex.h
--- linux-no64/include/linux/xfs_support/mutex.h Wed May 8 16:52:30 2002
+++ linux-x86_64/include/linux/xfs_support/mutex.h Tue May 7 19:54:32 2002
@@ -83,7 +83,7 @@ void _mutex_destroy( mutex_t *mutex);
static __inline__ int mutex_spinlock(spinlock_t *l)
{
- long flags;
+ unsigned long flags;
spin_lock_irqsave(l, flags);
return(flags);
}
diff -burp linux-no64/include/linux/xfs_support/sv.h
linux-x86_64/include/linux/xfs_support/sv.h
--- linux-no64/include/linux/xfs_support/sv.h Wed May 8 16:52:30 2002
+++ linux-x86_64/include/linux/xfs_support/sv.h Tue May 7 19:54:32 2002
@@ -70,7 +70,7 @@ typedef struct sv_s {
} sv_t;
void _sv_init(sv_t *sv);
-void _sv_wait(sv_t *sv, spinlock_t *lock, int spl, int intr, struct timespec
*timeout);
+void _sv_wait(sv_t *sv, spinlock_t *lock, unsigned long spl, int intr, struct
timespec *timeout);
void _sv_broadcast(sv_t *sv);
void _sv_signal(sv_t *sv);
|