Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / fs / freevxfs / vxfs_olt.c

diff --git a/fs/freevxfs/vxfs_olt.c b/fs/freevxfs/vxfs_olt.c
index 7a204e3..0495008 100644 (file)
--- a/fs/freevxfs/vxfs_olt.c
+++ b/fs/freevxfs/vxfs_olt.c
@@ -36,29 +36,27 @@
 
 #include "vxfs.h"
 #include "vxfs_olt.h"
+#include "vxfs_extern.h"
 
 
-static __inline__ void
+static inline void
 vxfs_get_fshead(struct vxfs_oltfshead *fshp, struct vxfs_sb_info *infp)
 {
-       if (infp->vsi_fshino)
-               BUG();
+       BUG_ON(infp->vsi_fshino);
        infp->vsi_fshino = fshp->olt_fsino[0];
 }
 
-static __inline__ void
+static inline void
 vxfs_get_ilist(struct vxfs_oltilist *ilistp, struct vxfs_sb_info *infp)
 {
-       if (infp->vsi_iext)
-               BUG();
+       BUG_ON(infp->vsi_iext);
        infp->vsi_iext = ilistp->olt_iext[0]; 
 }
 
-static __inline__ u_long
+static inline u_long
 vxfs_oblock(struct super_block *sbp, daddr_t block, u_long bsize)
 {
-       if (sbp->s_blocksize % bsize)
-               BUG();
+       BUG_ON(sbp->s_blocksize % bsize);
        return (block * (sbp->s_blocksize / bsize));
 }
 
@@ -104,8 +102,8 @@ vxfs_read_olt(struct super_block *sbp, u_long bsize)
                goto fail;
        }
 
-       oaddr = (char *)bp->b_data + op->olt_size;
-       eaddr = (char *)bp->b_data + (infp->vsi_oltsize * sbp->s_blocksize);
+       oaddr = bp->b_data + op->olt_size;
+       eaddr = bp->b_data + (infp->vsi_oltsize * sbp->s_blocksize);
 
        while (oaddr < eaddr) {
                struct vxfs_oltcommon   *ocp =