1 files changed, 13 insertions, 48 deletions
diff --git a/fs/ocfs2/aops.h b/fs/ocfs2/aops.h
index 45821d479b5a..389579bd64e3 100644
--- a/fs/ocfs2/aops.h
+++ b/fs/ocfs2/aops.h
@@ -42,57 +42,22 @@ int walk_page_buffers(	handle_t *handle,
                        int (*fn)(      handle_t *handle,
                                        struct buffer_head *bh));
-struct ocfs2_write_ctxt;
+int ocfs2_write_begin(struct file *file, struct address_space *mapping,
-typedef int (ocfs2_page_writer)(struct inode *, struct ocfs2_write_ctxt *,
+                      loff_t pos, unsigned len, unsigned flags,
-                                u64 *, unsigned int *, unsigned int *);
+                      struct page **pagep, void **fsdata);
-ssize_t ocfs2_buffered_write_cluster(struct file *file, loff_t pos,
+int ocfs2_write_end(struct file *file, struct address_space *mapping,
-                                     size_t count, ocfs2_page_writer *actor,
+                    loff_t pos, unsigned len, unsigned copied,
-                                     void *priv);
+                    struct page *page, void *fsdata);
-struct ocfs2_write_ctxt {
+int ocfs2_write_end_nolock(struct address_space *mapping,
-        size_t                          w_count;
+                           loff_t pos, unsigned len, unsigned copied,
-        loff_t                          w_pos;
+                           struct page *page, void *fsdata);
-        u32                             w_cpos;
-        unsigned int                    w_finished_copy;
-        /* This is true if page_size > cluster_size */
+int ocfs2_write_begin_nolock(struct address_space *mapping,
-        unsigned int                    w_large_pages;
+                             loff_t pos, unsigned len, unsigned flags,
+                             struct page **pagep, void **fsdata,
-        /* Filler callback and private data */
+                             struct buffer_head *di_bh, struct page *mmap_page);
-        ocfs2_page_writer               *w_write_data_page;
-        void                            *w_private;
-        /* Only valid for the filler callback */
-        struct page                     *w_this_page;
-        unsigned int                    w_this_page_new;
-};
-struct ocfs2_buffered_write_priv {
-        char                            *b_src_buf;
-        const struct iovec              *b_cur_iov; /* Current iovec */
-        size_t                          b_cur_off; /* Offset in the
-                                                    * current iovec */
-};
-int ocfs2_map_and_write_user_data(struct inode *inode,
-                                  struct ocfs2_write_ctxt *wc,
-                                  u64 *p_blkno,
-                                  unsigned int *ret_from,
-                                  unsigned int *ret_to);
-struct ocfs2_splice_write_priv {
-        struct splice_desc              *s_sd;
-        struct pipe_buffer              *s_buf;
-        struct pipe_inode_info          *s_pipe;
-        /* Neither offset value is ever larger than one page */
-        unsigned int                    s_offset;
-        unsigned int                    s_buf_offset;
-};
-int ocfs2_map_and_write_splice_data(struct inode *inode,
-                                    struct ocfs2_write_ctxt *wc,
-                                    u64 *p_blkno,
-                                    unsigned int *ret_from,
-                                    unsigned int *ret_to);
 /* all ocfs2_dio_end_io()'s fault */
 #define ocfs2_iocb_is_rw_locked(iocb) \

diff --git a/fs/ocfs2/aops.h b/fs/ocfs2/aops.h index 45821d479b5a..389579bd64e3 100644 --- a/fs/ocfs2/aops.h +++ b/fs/ocfs2/aops.h
@@ -42,57 +42,22 @@ int walk_page_buffers( handle_t *handle,
42	int (fn)( handle_t handle,	42	int (fn)( handle_t handle,
43	struct buffer_head *bh));	43	struct buffer_head *bh));
44		44
45	struct ocfs2_write_ctxt;	45	int ocfs2_write_begin(struct file file, struct address_space mapping,
46	typedef int (ocfs2_page_writer)(struct inode , struct ocfs2_write_ctxt ,	46	loff_t pos, unsigned len, unsigned flags,
47	u64 , unsigned int , unsigned int *);	47	struct page pagep, void fsdata);
48		48
49	ssize_t ocfs2_buffered_write_cluster(struct file *file, loff_t pos,	49	int ocfs2_write_end(struct file file, struct address_space mapping,
50	size_t count, ocfs2_page_writer *actor,	50	loff_t pos, unsigned len, unsigned copied,
51	void *priv);	51	struct page page, void fsdata);
52		52
53	struct ocfs2_write_ctxt {	53	int ocfs2_write_end_nolock(struct address_space *mapping,
54	size_t w_count;	54	loff_t pos, unsigned len, unsigned copied,
55	loff_t w_pos;	55	struct page page, void fsdata);
56	u32 w_cpos;
57	unsigned int w_finished_copy;
58		56
59	/* This is true if page_size > cluster_size */	57	int ocfs2_write_begin_nolock(struct address_space *mapping,
60	unsigned int w_large_pages;	58	loff_t pos, unsigned len, unsigned flags,
61		59	struct page pagep, void fsdata,
62	/* Filler callback and private data */	60	struct buffer_head di_bh, struct page mmap_page);
63	ocfs2_page_writer *w_write_data_page;
64	void *w_private;
65
66	/* Only valid for the filler callback */
67	struct page *w_this_page;
68	unsigned int w_this_page_new;
69	};
70
71	struct ocfs2_buffered_write_priv {
72	char *b_src_buf;
73	const struct iovec b_cur_iov; / Current iovec */
74	size_t b_cur_off; /* Offset in the
75	* current iovec */
76	};
77	int ocfs2_map_and_write_user_data(struct inode *inode,
78	struct ocfs2_write_ctxt *wc,
79	u64 *p_blkno,
80	unsigned int *ret_from,
81	unsigned int *ret_to);
82
83	struct ocfs2_splice_write_priv {
84	struct splice_desc *s_sd;
85	struct pipe_buffer *s_buf;
86	struct pipe_inode_info *s_pipe;
87	/* Neither offset value is ever larger than one page */
88	unsigned int s_offset;
89	unsigned int s_buf_offset;
90	};
91	int ocfs2_map_and_write_splice_data(struct inode *inode,
92	struct ocfs2_write_ctxt *wc,
93	u64 *p_blkno,
94	unsigned int *ret_from,
95	unsigned int *ret_to);
96		61
97	/* all ocfs2_dio_end_io()'s fault */	62	/* all ocfs2_dio_end_io()'s fault */
98	#define ocfs2_iocb_is_rw_locked(iocb) \	63	#define ocfs2_iocb_is_rw_locked(iocb) \