1 files changed, 28 insertions, 71 deletions

diff --git a/fs/xfs/xfs_rw.h b/fs/xfs/xfs_rw.h
index c8b10bf8f530..90233037fab1 100644
--- a/fs/xfs/xfs_rw.h
+++ b/fs/xfs/xfs_rw.h
@@ -68,87 +68,44 @@ struct xfs_mount;
  * file is a real time file or not, because the bmap code
  * does.
  */
-#if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_FSB_TO_DB)
-xfs_daddr_t xfs_fsb_to_db(struct xfs_inode *ip, xfs_fsblock_t fsb);
 #define XFS_FSB_TO_DB(ip,fsb)   xfs_fsb_to_db(ip,fsb)
-#else
-#define XFS_FSB_TO_DB(ip,fsb) \
-                (((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME) ? \
+static inline xfs_daddr_t
+xfs_fsb_to_db(struct xfs_inode *ip, xfs_fsblock_t fsb)
+{
+        return (((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME) ? \
                  (xfs_daddr_t)XFS_FSB_TO_BB((ip)->i_mount, (fsb)) : \
-                 XFS_FSB_TO_DADDR((ip)->i_mount, (fsb)))
-#endif
-
-#define XFS_FSB_TO_DB_IO(io,fsb) \
-                (((io)->io_flags & XFS_IOCORE_RT) ? \
+                 XFS_FSB_TO_DADDR((ip)->i_mount, (fsb)));
+}
+#define XFS_FSB_TO_DB_IO(io,fsb) xfs_fsb_to_db_io(io,fsb)
+static inline xfs_daddr_t
+xfs_fsb_to_db_io(struct xfs_iocore *io, xfs_fsblock_t fsb)
+{
+        return (((io)->io_flags & XFS_IOCORE_RT) ? \
                  XFS_FSB_TO_BB((io)->io_mount, (fsb)) : \
-                 XFS_FSB_TO_DADDR((io)->io_mount, (fsb)))
+                 XFS_FSB_TO_DADDR((io)->io_mount, (fsb)));
+}
 
 /*
  * Prototypes for functions in xfs_rw.c.
  */
-
-int
-xfs_write_clear_setuid(
-        struct xfs_inode        *ip);
-
-int
-xfs_bwrite(
-        struct xfs_mount        *mp,
-        struct xfs_buf          *bp);
-
-int
-xfs_bioerror(
-        struct xfs_buf          *b);
-
-int
-xfs_bioerror_relse(
-        struct xfs_buf          *b);
-
-int
-xfs_read_buf(
-        struct xfs_mount        *mp,
-        xfs_buftarg_t           *target,
-        xfs_daddr_t             blkno,
-        int                     len,
-        uint                    flags,
-        struct xfs_buf          **bpp);
-
-void
-xfs_ioerror_alert(
-        char                    *func,
-        struct xfs_mount        *mp,
-        xfs_buf_t               *bp,
-        xfs_daddr_t             blkno);
-
+extern int xfs_write_clear_setuid(struct xfs_inode *ip);
+extern int xfs_bwrite(struct xfs_mount *mp, struct xfs_buf *bp);
+extern int xfs_bioerror(struct xfs_buf *bp);
+extern int xfs_bioerror_relse(struct xfs_buf *bp);
+extern int xfs_read_buf(struct xfs_mount *mp, xfs_buftarg_t *btp,
+                        xfs_daddr_t blkno, int len, uint flags,
+                        struct xfs_buf **bpp);
+extern void xfs_ioerror_alert(char *func, struct xfs_mount *mp,
+                                xfs_buf_t *bp, xfs_daddr_t blkno);
 
 /*
  * Prototypes for functions in xfs_vnodeops.c.
  */
-
-int
-xfs_rwlock(
-        bhv_desc_t              *bdp,
-        vrwlock_t               write_lock);
-
-void
-xfs_rwunlock(
-        bhv_desc_t              *bdp,
-        vrwlock_t               write_lock);
-
-int
-xfs_change_file_space(
-        bhv_desc_t              *bdp,
-        int                     cmd,
-        xfs_flock64_t           *bf,
-        xfs_off_t               offset,
-        cred_t                  *credp,
-        int                     flags);
-
-int
-xfs_set_dmattrs(
-        bhv_desc_t              *bdp,
-        u_int                   evmask,
-        u_int16_t               state,
-        cred_t                  *credp);
+extern int xfs_rwlock(bhv_desc_t *bdp, vrwlock_t write_lock);
+extern void xfs_rwunlock(bhv_desc_t *bdp, vrwlock_t write_lock);
+extern int xfs_change_file_space(bhv_desc_t *bdp, int cmd, xfs_flock64_t *bf,
+                                 xfs_off_t offset, cred_t *credp, int flags);
+extern int xfs_set_dmattrs(bhv_desc_t *bdp, u_int evmask, u_int16_t state,
+                           cred_t *credp);
 
 #endif /* __XFS_RW_H__ */