sysv: convert to new aops

Signed-off-by: Nick Piggin <npiggin@suse.de> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

sysv: convert to new aops
Signed-off-by: Nick Piggin <npiggin@suse.de> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Nick Piggin · Linus Torvalds
1 parent be021ee41a
Showing 3 changed files with 52 additions and 24 deletions Side-by-side Diff
fs/sysv/dir.c
fs/sysv/itree.c
fs/sysv/sysv.h
@@ -16,6 +16,7 @@
 #include <linux/pagemap.h>
 #include <linux/highmem.h>
 #include <linux/smp_lock.h>
+#include <linux/swap.h>
 #include "sysv.h"
  
 static int sysv_readdir(struct file *, void *, filldir_t);
  
  
@@ -37,12 +38,17 @@
 	return (inode->i_size+PAGE_CACHE_SIZE-1)>>PAGE_CACHE_SHIFT;
 }
  
-static int dir_commit_chunk(struct page *page, unsigned from, unsigned to)
+static int dir_commit_chunk(struct page *page, loff_t pos, unsigned len)
 {
-	struct inode *dir = (struct inode *)page->mapping->host;
+	struct address_space *mapping = page->mapping;
+	struct inode *dir = mapping->host;
 	int err = 0;
  
-	page->mapping->a_ops->commit_write(NULL, page, from, to);
+	block_write_end(NULL, mapping, pos, len, len, page, NULL);
+	if (pos+len > dir->i_size) {
+		i_size_write(dir, pos+len);
+		mark_inode_dirty(dir);
+	}
 	if (IS_DIRSYNC(dir))
 		err = write_one_page(page, 1);
 	else
@@ -186,7 +192,7 @@
 	unsigned long npages = dir_pages(dir);
 	unsigned long n;
 	char *kaddr;
-	unsigned from, to;
+	loff_t pos;
 	int err;
  
 	/* We take care of directory expansion in the same loop */
  
  
@@ -212,16 +218,17 @@
 	return -EINVAL;
  
 got_it:
-	from = (char*)de - (char*)page_address(page);
-	to = from + SYSV_DIRSIZE;
+	pos = page_offset(page) +
+			(char*)de - (char*)page_address(page);
 	lock_page(page);
-	err = page->mapping->a_ops->prepare_write(NULL, page, from, to);
+	err = __sysv_write_begin(NULL, page->mapping, pos, SYSV_DIRSIZE,
+				AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
 	if (err)
 		goto out_unlock;
 	memcpy (de->name, name, namelen);
 	memset (de->name + namelen, 0, SYSV_DIRSIZE - namelen - 2);
 	de->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), inode->i_ino);
-	err = dir_commit_chunk(page, from, to);
+	err = dir_commit_chunk(page, pos, SYSV_DIRSIZE);
 	dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
 	mark_inode_dirty(dir);
 out_page:
  
  
@@ -238,15 +245,15 @@
 	struct address_space *mapping = page->mapping;
 	struct inode *inode = (struct inode*)mapping->host;
 	char *kaddr = (char*)page_address(page);
-	unsigned from = (char*)de - kaddr;
-	unsigned to = from + SYSV_DIRSIZE;
+	loff_t pos = page_offset(page) + (char *)de - kaddr;
 	int err;
  
 	lock_page(page);
-	err = mapping->a_ops->prepare_write(NULL, page, from, to);
+	err = __sysv_write_begin(NULL, mapping, pos, SYSV_DIRSIZE,
+				AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
 	BUG_ON(err);
 	de->inode = 0;
-	err = dir_commit_chunk(page, from, to);
+	err = dir_commit_chunk(page, pos, SYSV_DIRSIZE);
 	dir_put_page(page);
 	inode->i_ctime = inode->i_mtime = CURRENT_TIME_SEC;
 	mark_inode_dirty(inode);
  
@@ -263,12 +270,13 @@
  
 	if (!page)
 		return -ENOMEM;
-	kmap(page);
-	err = mapping->a_ops->prepare_write(NULL, page, 0, 2 * SYSV_DIRSIZE);
+	err = __sysv_write_begin(NULL, mapping, 0, 2 * SYSV_DIRSIZE,
+				AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
 	if (err) {
 		unlock_page(page);
 		goto fail;
 	}
+	kmap(page);
  
 	base = (char*)page_address(page);
 	memset(base, 0, PAGE_CACHE_SIZE);
  
@@ -280,9 +288,9 @@
 	de->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), dir->i_ino);
 	strcpy(de->name,"..");
  
+	kunmap(page);
 	err = dir_commit_chunk(page, 0, 2 * SYSV_DIRSIZE);
 fail:
-	kunmap(page);
 	page_cache_release(page);
 	return err;
 }
  
  
@@ -336,16 +344,18 @@
 void sysv_set_link(struct sysv_dir_entry *de, struct page *page,
 	struct inode *inode)
 {
-	struct inode *dir = (struct inode*)page->mapping->host;
-	unsigned from = (char *)de-(char*)page_address(page);
-	unsigned to = from + SYSV_DIRSIZE;
+	struct address_space *mapping = page->mapping;
+	struct inode *dir = mapping->host;
+	loff_t pos = page_offset(page) +
+			(char *)de-(char*)page_address(page);
 	int err;
  
 	lock_page(page);
-	err = page->mapping->a_ops->prepare_write(NULL, page, from, to);
+	err = __sysv_write_begin(NULL, mapping, pos, SYSV_DIRSIZE,
+				AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
 	BUG_ON(err);
 	de->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), inode->i_ino);
-	err = dir_commit_chunk(page, from, to);
+	err = dir_commit_chunk(page, pos, SYSV_DIRSIZE);
 	dir_put_page(page);
 	dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
 	mark_inode_dirty(dir);
@@ -453,24 +453,39 @@
 {
 	return block_write_full_page(page,get_block,wbc);
 }
+
 static int sysv_readpage(struct file *file, struct page *page)
 {
 	return block_read_full_page(page,get_block);
 }
-static int sysv_prepare_write(struct file *file, struct page *page, unsigned from, unsigned to)
+
+int __sysv_write_begin(struct file *file, struct address_space *mapping,
+			loff_t pos, unsigned len, unsigned flags,
+			struct page **pagep, void **fsdata)
 {
-	return block_prepare_write(page,from,to,get_block);
+	return block_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
+				get_block);
 }
+
+static int sysv_write_begin(struct file *file, struct address_space *mapping,
+			loff_t pos, unsigned len, unsigned flags,
+			struct page **pagep, void **fsdata)
+{
+	*pagep = NULL;
+	return __sysv_write_begin(file, mapping, pos, len, flags, pagep, fsdata);
+}
+
 static sector_t sysv_bmap(struct address_space *mapping, sector_t block)
 {
 	return generic_block_bmap(mapping,block,get_block);
 }
+
 const struct address_space_operations sysv_aops = {
 	.readpage = sysv_readpage,
 	.writepage = sysv_writepage,
 	.sync_page = block_sync_page,
-	.prepare_write = sysv_prepare_write,
-	.commit_write = generic_commit_write,
+	.write_begin = sysv_write_begin,
+	.write_end = generic_write_end,
 	.bmap = sysv_bmap
 };
@@ -136,6 +136,9 @@
  
 /* itree.c */
 extern void sysv_truncate(struct inode *);
+extern int __sysv_write_begin(struct file *file, struct address_space *mapping,
+			loff_t pos, unsigned len, unsigned flags,
+			struct page **pagep, void **fsdata);
  
 /* inode.c */
 extern int sysv_write_inode(struct inode *, int);
...	...	@@ -16,6 +16,7 @@
16	16	#include <linux/pagemap.h>
17	17	#include <linux/highmem.h>
18	18	#include <linux/smp_lock.h>
	19	+#include <linux/swap.h>
19	20	#include "sysv.h"
20	21
21	22	static int sysv_readdir(struct file , void , filldir_t);
22	23
23	24
...	...	@@ -37,12 +38,17 @@
37	38	return (inode->i_size+PAGE_CACHE_SIZE-1)>>PAGE_CACHE_SHIFT;
38	39	}
39	40
40		-static int dir_commit_chunk(struct page *page, unsigned from, unsigned to)
	41	+static int dir_commit_chunk(struct page *page, loff_t pos, unsigned len)
41	42	{
42		- struct inode dir = (struct inode )page->mapping->host;
	43	+ struct address_space *mapping = page->mapping;
	44	+ struct inode *dir = mapping->host;
43	45	int err = 0;
44	46
45		- page->mapping->a_ops->commit_write(NULL, page, from, to);
	47	+ block_write_end(NULL, mapping, pos, len, len, page, NULL);
	48	+ if (pos+len > dir->i_size) {
	49	+ i_size_write(dir, pos+len);
	50	+ mark_inode_dirty(dir);
	51	+ }
46	52	if (IS_DIRSYNC(dir))
47	53	err = write_one_page(page, 1);
48	54	else
...	...	@@ -186,7 +192,7 @@
186	192	unsigned long npages = dir_pages(dir);
187	193	unsigned long n;
188	194	char *kaddr;
189		- unsigned from, to;
	195	+ loff_t pos;
190	196	int err;
191	197
192	198	/* We take care of directory expansion in the same loop */
193	199
194	200
...	...	@@ -212,16 +218,17 @@
212	218	return -EINVAL;
213	219
214	220	got_it:
215		- from = (char)de - (char)page_address(page);
216		- to = from + SYSV_DIRSIZE;
	221	+ pos = page_offset(page) +
	222	+ (char)de - (char)page_address(page);
217	223	lock_page(page);
218		- err = page->mapping->a_ops->prepare_write(NULL, page, from, to);
	224	+ err = __sysv_write_begin(NULL, page->mapping, pos, SYSV_DIRSIZE,
	225	+ AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
219	226	if (err)
220	227	goto out_unlock;
221	228	memcpy (de->name, name, namelen);
222	229	memset (de->name + namelen, 0, SYSV_DIRSIZE - namelen - 2);
223	230	de->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), inode->i_ino);
224		- err = dir_commit_chunk(page, from, to);
	231	+ err = dir_commit_chunk(page, pos, SYSV_DIRSIZE);
225	232	dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
226	233	mark_inode_dirty(dir);
227	234	out_page:
228	235
229	236
...	...	@@ -238,15 +245,15 @@
238	245	struct address_space *mapping = page->mapping;
239	246	struct inode inode = (struct inode)mapping->host;
240	247	char kaddr = (char)page_address(page);
241		- unsigned from = (char*)de - kaddr;
242		- unsigned to = from + SYSV_DIRSIZE;
	248	+ loff_t pos = page_offset(page) + (char *)de - kaddr;
243	249	int err;
244	250
245	251	lock_page(page);
246		- err = mapping->a_ops->prepare_write(NULL, page, from, to);
	252	+ err = __sysv_write_begin(NULL, mapping, pos, SYSV_DIRSIZE,
	253	+ AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
247	254	BUG_ON(err);
248	255	de->inode = 0;
249		- err = dir_commit_chunk(page, from, to);
	256	+ err = dir_commit_chunk(page, pos, SYSV_DIRSIZE);
250	257	dir_put_page(page);
251	258	inode->i_ctime = inode->i_mtime = CURRENT_TIME_SEC;
252	259	mark_inode_dirty(inode);
253	260
...	...	@@ -263,12 +270,13 @@
263	270
264	271	if (!page)
265	272	return -ENOMEM;
266		- kmap(page);
267		- err = mapping->a_ops->prepare_write(NULL, page, 0, 2 * SYSV_DIRSIZE);
	273	+ err = __sysv_write_begin(NULL, mapping, 0, 2 * SYSV_DIRSIZE,
	274	+ AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
268	275	if (err) {
269	276	unlock_page(page);
270	277	goto fail;
271	278	}
	279	+ kmap(page);
272	280
273	281	base = (char*)page_address(page);
274	282	memset(base, 0, PAGE_CACHE_SIZE);
275	283
...	...	@@ -280,9 +288,9 @@
280	288	de->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), dir->i_ino);
281	289	strcpy(de->name,"..");
282	290
	291	+ kunmap(page);
283	292	err = dir_commit_chunk(page, 0, 2 * SYSV_DIRSIZE);
284	293	fail:
285		- kunmap(page);
286	294	page_cache_release(page);
287	295	return err;
288	296	}
289	297
290	298
...	...	@@ -336,16 +344,18 @@
336	344	void sysv_set_link(struct sysv_dir_entry de, struct page page,
337	345	struct inode *inode)
338	346	{
339		- struct inode dir = (struct inode)page->mapping->host;
340		- unsigned from = (char )de-(char)page_address(page);
341		- unsigned to = from + SYSV_DIRSIZE;
	347	+ struct address_space *mapping = page->mapping;
	348	+ struct inode *dir = mapping->host;
	349	+ loff_t pos = page_offset(page) +
	350	+ (char )de-(char)page_address(page);
342	351	int err;
343	352
344	353	lock_page(page);
345		- err = page->mapping->a_ops->prepare_write(NULL, page, from, to);
	354	+ err = __sysv_write_begin(NULL, mapping, pos, SYSV_DIRSIZE,
	355	+ AOP_FLAG_UNINTERRUPTIBLE, &page, NULL);
346	356	BUG_ON(err);
347	357	de->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), inode->i_ino);
348		- err = dir_commit_chunk(page, from, to);
	358	+ err = dir_commit_chunk(page, pos, SYSV_DIRSIZE);
349	359	dir_put_page(page);
350	360	dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
351	361	mark_inode_dirty(dir);
...	...	@@ -453,24 +453,39 @@
453	453	{
454	454	return block_write_full_page(page,get_block,wbc);
455	455	}
	456	+
456	457	static int sysv_readpage(struct file file, struct page page)
457	458	{
458	459	return block_read_full_page(page,get_block);
459	460	}
460		-static int sysv_prepare_write(struct file file, struct page page, unsigned from, unsigned to)
	461	+
	462	+int __sysv_write_begin(struct file file, struct address_space mapping,
	463	+ loff_t pos, unsigned len, unsigned flags,
	464	+ struct page pagep, void fsdata)
461	465	{
462		- return block_prepare_write(page,from,to,get_block);
	466	+ return block_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
	467	+ get_block);
463	468	}
	469	+
	470	+static int sysv_write_begin(struct file file, struct address_space mapping,
	471	+ loff_t pos, unsigned len, unsigned flags,
	472	+ struct page pagep, void fsdata)
	473	+{
	474	+ *pagep = NULL;
	475	+ return __sysv_write_begin(file, mapping, pos, len, flags, pagep, fsdata);
	476	+}
	477	+
464	478	static sector_t sysv_bmap(struct address_space *mapping, sector_t block)
465	479	{
466	480	return generic_block_bmap(mapping,block,get_block);
467	481	}
	482	+
468	483	const struct address_space_operations sysv_aops = {
469	484	.readpage = sysv_readpage,
470	485	.writepage = sysv_writepage,
471	486	.sync_page = block_sync_page,
472		- .prepare_write = sysv_prepare_write,
473		- .commit_write = generic_commit_write,
	487	+ .write_begin = sysv_write_begin,
	488	+ .write_end = generic_write_end,
474	489	.bmap = sysv_bmap
475	490	};
...	...	@@ -136,6 +136,9 @@
136	136
137	137	/* itree.c */
138	138	extern void sysv_truncate(struct inode *);
	139	+extern int __sysv_write_begin(struct file file, struct address_space mapping,
	140	+ loff_t pos, unsigned len, unsigned flags,
	141	+ struct page pagep, void fsdata);
139	142
140	143	/* inode.c */
141	144	extern int sysv_write_inode(struct inode *, int);