summaryrefslogtreecommitdiffstats
path: root/fs/ext3/namei.c
diff options
context:
space:
mode:
authorJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-03-14 21:18:01 +0100
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-03-14 21:18:01 +0100
commitf33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d (patch)
treeb027b5f3429d416b3da5b9195024007dab062a5e /fs/ext3/namei.c
parent[SCSI] drivers/base/bus.c - export reprobe (diff)
parent[PATCH] Plug kdump shutdown race window (diff)
downloadlinux-f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d.tar.xz
linux-f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d.zip
Merge ../linux-2.6
Diffstat (limited to 'fs/ext3/namei.c')
-rw-r--r--fs/ext3/namei.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index 8bd8ac077704..b8f5cd1e540d 100644
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -2141,7 +2141,8 @@ retry:
* We have a transaction open. All is sweetness. It also sets
* i_size in generic_commit_write().
*/
- err = page_symlink(inode, symname, l);
+ err = __page_symlink(inode, symname, l,
+ mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS);
if (err) {
ext3_dec_count(handle, inode);
ext3_mark_inode_dirty(handle, inode);