Pull misc-for-upstream into release branch

[linux-2.6-omap-h63xx.git] / fs / hpfs / file.c

diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c
index 8b94d24855f00b7ece487dc2b1cd5b5a741af0db..b4eafc0f1e54b40007b9831a6661012cfaa0ebe0 100644 (file)
--- a/fs/hpfs/file.c
+++ b/fs/hpfs/file.c
@@ -115,7 +115,7 @@ static ssize_t hpfs_file_write(struct file *file, const char __user *buf,
 
        retval = do_sync_write(file, buf, count, ppos);
        if (retval > 0)
-               hpfs_i(file->f_dentry->d_inode)->i_dirty = 1;
+               hpfs_i(file->f_path.dentry->d_inode)->i_dirty = 1;
        return retval;
 }
 
@@ -132,7 +132,7 @@ const struct file_operations hpfs_file_ops =
        .sendfile       = generic_file_sendfile,
 };
 
-struct inode_operations hpfs_file_iops =
+const struct inode_operations hpfs_file_iops =
 {
        .truncate       = hpfs_truncate,
        .setattr        = hpfs_notify_change,