diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-27 07:40:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-27 07:40:08 -0400 |
| commit | 15d3b4a26291c170563e2b25ded5de1324f93959 (patch) | |
| tree | 9bea548a7de5215c58a091d58f4eefdb92349f2c /mm/filemap_xip.c | |
| parent | 2c3abab7c95295f319dc8899b74cbd60140fcdfb (diff) | |
| parent | 8be1a6d6c77ab4532e4476fdb8177030ef48b52c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 | ||