X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=fs%2Fhfs%2Finode.c;h=fafcba593871889efb1e193e4b818515e40725ca;hb=25c4e53a4c9bfe45be52821f54ec5ce957519db2;hp=02f5573e03491b597a7d68b40fb45f72f87e4a07;hpb=e30fdb1e026c2d05f216d2e5a25bfafdfd261ec2;p=powerpc.git

diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index 02f5573e03..fafcba5938 100644
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -18,7 +18,7 @@
 #include "btree.h"
 
 static const struct file_operations hfs_file_operations;
-static struct inode_operations hfs_file_inode_operations;
+static const struct inode_operations hfs_file_inode_operations;
 
 /*================ Variable-like macros ================*/
 
@@ -102,7 +102,7 @@ static ssize_t hfs_direct_IO(int rw, struct kiocb *iocb,
 		const struct iovec *iov, loff_t offset, unsigned long nr_segs)
 {
 	struct file *file = iocb->ki_filp;
-	struct inode *inode = file->f_dentry->d_inode->i_mapping->host;
+	struct inode *inode = file->f_path.dentry->d_inode->i_mapping->host;
 
 	return blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iov,
 				  offset, nr_segs, hfs_get_block, NULL);
@@ -612,7 +612,7 @@ static const struct file_operations hfs_file_operations = {
 	.release	= hfs_file_release,
 };
 
-static struct inode_operations hfs_file_inode_operations = {
+static const struct inode_operations hfs_file_inode_operations = {
 	.lookup		= hfs_file_lookup,
 	.truncate	= hfs_file_truncate,
 	.setattr	= hfs_inode_setattr,