ipg: balance locking in irq handler

[linux-2.6-omap-h63xx.git] / fs / xfs / linux-2.6 / xfs_lrw.h

diff --git a/fs/xfs/linux-2.6/xfs_lrw.h b/fs/xfs/linux-2.6/xfs_lrw.h
index 38864a88d42d4bb1195708fd9b047ebd907bc17c..4b7747a828d9a090a764097ff6accb4800cb1f53 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_lrw.h
+++ b/fs/xfs/linux-2.6/xfs_lrw.h
@@ -18,8 +18,6 @@
 #ifndef __XFS_LRW_H__
 #define __XFS_LRW_H__
 
-struct vnode;
-struct bhv_desc;
 struct xfs_mount;
 struct xfs_iocore;
 struct xfs_inode;
@@ -49,7 +47,7 @@ struct xfs_iomap;
 #define        XFS_CTRUNC4             14
 #define        XFS_CTRUNC5             15
 #define        XFS_CTRUNC6             16
-#define        XFS_BUNMAPI             17
+#define        XFS_BUNMAP              17
 #define        XFS_INVAL_CACHED        18
 #define        XFS_DIORD_ENTER         19
 #define        XFS_DIOWR_ENTER         20
@@ -60,6 +58,8 @@ struct xfs_iomap;
 #define        XFS_IOMAP_ALLOC_ENTER   25
 #define        XFS_IOMAP_ALLOC_MAP     26
 #define        XFS_IOMAP_UNWRITTEN     27
+#define XFS_SPLICE_READ_ENTER  28
+#define XFS_SPLICE_WRITE_ENTER 29
 extern void xfs_rw_enter_trace(int, struct xfs_iocore *,
                                void *, size_t, loff_t, int);
 extern void xfs_inval_cached_trace(struct xfs_iocore *,
@@ -69,28 +69,11 @@ extern void xfs_inval_cached_trace(struct xfs_iocore *,
 #define xfs_inval_cached_trace(io, offset, len, first, last)
 #endif
 
-/*
- * Maximum count of bmaps used by read and write paths.
- */
-#define        XFS_MAX_RW_NBMAPS       4
-
-extern int xfs_bmap(struct bhv_desc *, xfs_off_t, ssize_t, int,
-                       struct xfs_iomap *, int *);
 extern int xfsbdstrat(struct xfs_mount *, struct xfs_buf *);
 extern int xfs_bdstrat_cb(struct xfs_buf *);
-
-extern int xfs_zero_eof(struct vnode *, struct xfs_iocore *, xfs_off_t,
-                               xfs_fsize_t, xfs_fsize_t);
-extern ssize_t xfs_read(struct bhv_desc *, struct kiocb *,
-                               const struct iovec *, unsigned int,
-                               loff_t *, int, struct cred *);
-extern ssize_t xfs_write(struct bhv_desc *, struct kiocb *,
-                               const struct iovec *, unsigned int,
-                               loff_t *, int, struct cred *);
-extern ssize_t xfs_sendfile(struct bhv_desc *, struct file *,
-                               loff_t *, int, size_t, read_actor_t,
-                               void *, struct cred *);
-
 extern int xfs_dev_is_read_only(struct xfs_mount *, char *);
 
+extern int xfs_zero_eof(struct inode *, struct xfs_iocore *, xfs_off_t,
+                               xfs_fsize_t);
+
 #endif /* __XFS_LRW_H__ */