[PATCH] __page_symlink retry loop error code fix

If prepare_write or commit_write return AOP_TRUNCATED_PAGE we jump to "retry" label and than if find_or_create_page() failed function return incorrect error code. Signed-off-by: Dmitriy Monakhov <dmonakhov@openvz.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

[PATCH] __page_symlink retry loop error code fix
If prepare_write or commit_write return AOP_TRUNCATED_PAGE we jump to "retry" label and than if find_or_create_page() failed function return incorrect error code. Signed-off-by: Dmitriy Monakhov <dmonakhov@openvz.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Dmitriy Monakhov · Linus Torvalds
1 parent fb4d64e78c
Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff
fs/namei.c
@@ -2688,10 +2688,11 @@
 {
 	struct address_space *mapping = inode->i_mapping;
 	struct page *page;
-	int err = -ENOMEM;
+	int err;
 	char *kaddr;
  
 retry:
+	err = -ENOMEM;
 	page = find_or_create_page(mapping, 0, gfp_mask);
 	if (!page)
 		goto fail;
...	...	@@ -2688,10 +2688,11 @@
2688	2688	{
2689	2689	struct address_space *mapping = inode->i_mapping;
2690	2690	struct page *page;
2691		- int err = -ENOMEM;
	2691	+ int err;
2692	2692	char *kaddr;
2693	2693
2694	2694	retry:
	2695	+ err = -ENOMEM;
2695	2696	page = find_or_create_page(mapping, 0, gfp_mask);
2696	2697	if (!page)
2697	2698	goto fail;