diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
| commit | 414f746d232d41ed6ae8632c4495ae795373c44b (patch) | |
| tree | 167f9bc8f139c6e82e6732b38c7a938b8a9d31cd /mm/filemap_xip.c | |
| parent | 5a7a201c51c324876d00a54e7208af6af12d1ca4 (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'mm/filemap_xip.c')
| -rw-r--r-- | mm/filemap_xip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c index 3e744abcce9d..98a3f31ccd6a 100644 --- a/mm/filemap_xip.c +++ b/mm/filemap_xip.c | |||
| @@ -380,7 +380,7 @@ xip_file_write(struct file *filp, const char __user *buf, size_t len, | |||
| 380 | if (count == 0) | 380 | if (count == 0) |
| 381 | goto out_backing; | 381 | goto out_backing; |
| 382 | 382 | ||
| 383 | ret = remove_suid(filp->f_path.dentry); | 383 | ret = file_remove_suid(filp); |
| 384 | if (ret) | 384 | if (ret) |
| 385 | goto out_backing; | 385 | goto out_backing; |
| 386 | 386 | ||