Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / fs / xfs / xfs_iomap.h

diff --git a/fs/xfs/xfs_iomap.h b/fs/xfs/xfs_iomap.h
index 7748a430f50d229d82d66771ee759927dc41d983..80615760959ae169dddb471af1964c4ee03f448e 100644 (file)
--- a/fs/xfs/xfs_iomap.h
+++ b/fs/xfs/xfs_iomap.h
@@ -18,30 +18,15 @@
 #ifndef __XFS_IOMAP_H__
 #define __XFS_IOMAP_H__
 
-/* base extent manipulation calls */
-#define BMAPI_READ     (1 << 0)        /* read extents */
-#define BMAPI_WRITE    (1 << 1)        /* create extents */
-#define BMAPI_ALLOCATE (1 << 2)        /* delayed allocate to real extents */
-
-/* modifiers */
-#define BMAPI_IGNSTATE (1 << 4)        /* ignore unwritten state on read */
-#define BMAPI_DIRECT   (1 << 5)        /* direct instead of buffered write */
-#define BMAPI_MMA      (1 << 6)        /* allocate for mmap write */
-#define BMAPI_TRYLOCK  (1 << 7)        /* non-blocking request */
-
-#define BMAPI_FLAGS \
-       { BMAPI_READ,           "READ" }, \
-       { BMAPI_WRITE,          "WRITE" }, \
-       { BMAPI_ALLOCATE,       "ALLOCATE" }, \
-       { BMAPI_IGNSTATE,       "IGNSTATE" }, \
-       { BMAPI_DIRECT,         "DIRECT" }, \
-       { BMAPI_TRYLOCK,        "TRYLOCK" }
-
 struct xfs_inode;
 struct xfs_bmbt_irec;
 
-extern int xfs_iomap(struct xfs_inode *, xfs_off_t, ssize_t, int,
-                    struct xfs_bmbt_irec *, int *, int *);
+extern int xfs_iomap_write_direct(struct xfs_inode *, xfs_off_t, size_t,
+                       struct xfs_bmbt_irec *, int);
+extern int xfs_iomap_write_delay(struct xfs_inode *, xfs_off_t, size_t,
+                       struct xfs_bmbt_irec *);
+extern int xfs_iomap_write_allocate(struct xfs_inode *, xfs_off_t, size_t,
+                       struct xfs_bmbt_irec *);
 extern int xfs_iomap_write_unwritten(struct xfs_inode *, xfs_off_t, size_t);
 
 #endif /* __XFS_IOMAP_H__*/