X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=mm%2Ffilemap_xip.c;h=8d667617f55847903ad1d364f6ee7fde3612f069;hb=8c08540f8755c451d8b96ea14cfe796bc3cd712d;hp=b960ac8e5918dcb33e64b9b4f822f25540ddb4b4;hpb=ab396e91bfe953db26fa1083d9c3e7a4fbe0334a;p=linux-2.6

diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c
index b960ac8e59..8d667617f5 100644
--- a/mm/filemap_xip.c
+++ b/mm/filemap_xip.c
@@ -273,7 +273,7 @@ __xip_file_write(struct file *filp, const char __user *buf,
 		  size_t count, loff_t pos, loff_t *ppos)
 {
 	struct address_space * mapping = filp->f_mapping;
-	struct address_space_operations *a_ops = mapping->a_ops;
+	const struct address_space_operations *a_ops = mapping->a_ops;
 	struct inode 	*inode = mapping->host;
 	long		status = 0;
 	struct page	*page;
@@ -379,7 +379,7 @@ xip_file_write(struct file *filp, const char __user *buf, size_t len,
 	if (count == 0)
 		goto out_backing;
 
-	ret = remove_suid(filp->f_dentry);
+	ret = remove_suid(filp->f_path.dentry);
 	if (ret)
 		goto out_backing;