[PATCH] ext3: ext3_symlink should use GFP_NOFS allocations inside
This patch fixes illegal __GFP_FS allocation inside ext3 transaction in ext3_symlink(). Such allocation may re-enter ext3 code from try_to_free_pages. But JBD/ext3 code keeps a pointer to current journal handle in task_struct and, hence, is not reentrable. This bug led to "Assertion failure in journal_dirty_metadata()" messages. http://bugzilla.openvz.org/show_bug.cgi?id=115 Signed-off-by: Andrey Savochkin <saw@saw.sw.com.sg> Signed-off-by: Kirill Korotaev <dev@openvz.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
8bd0ee93fe
commit
0adb25d2e7
+11
-2
@@ -2613,13 +2613,15 @@ void page_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
|
||||
}
|
||||
}
|
||||
|
||||
int page_symlink(struct inode *inode, const char *symname, int len)
|
||||
int __page_symlink(struct inode *inode, const char *symname, int len,
|
||||
gfp_t gfp_mask)
|
||||
{
|
||||
struct address_space *mapping = inode->i_mapping;
|
||||
struct page *page = grab_cache_page(mapping, 0);
|
||||
struct page *page;
|
||||
int err = -ENOMEM;
|
||||
char *kaddr;
|
||||
|
||||
page = find_or_create_page(mapping, 0, gfp_mask);
|
||||
if (!page)
|
||||
goto fail;
|
||||
err = mapping->a_ops->prepare_write(NULL, page, 0, len-1);
|
||||
@@ -2654,6 +2656,12 @@ fail:
|
||||
return err;
|
||||
}
|
||||
|
||||
int page_symlink(struct inode *inode, const char *symname, int len)
|
||||
{
|
||||
return __page_symlink(inode, symname, len,
|
||||
mapping_gfp_mask(inode->i_mapping));
|
||||
}
|
||||
|
||||
struct inode_operations page_symlink_inode_operations = {
|
||||
.readlink = generic_readlink,
|
||||
.follow_link = page_follow_link_light,
|
||||
@@ -2672,6 +2680,7 @@ EXPORT_SYMBOL(lookup_one_len);
|
||||
EXPORT_SYMBOL(page_follow_link_light);
|
||||
EXPORT_SYMBOL(page_put_link);
|
||||
EXPORT_SYMBOL(page_readlink);
|
||||
EXPORT_SYMBOL(__page_symlink);
|
||||
EXPORT_SYMBOL(page_symlink);
|
||||
EXPORT_SYMBOL(page_symlink_inode_operations);
|
||||
EXPORT_SYMBOL(path_lookup);
|
||||
|
||||
Reference in New Issue
Block a user