]> err.no Git - linux-2.6/blobdiff - fs/udf/file.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[linux-2.6] / fs / udf / file.c
index 7aedd552cba12c205706fb921dd0bde45ec68e11..40d5047defea912289f85c40c300afb4ac9aaa81 100644 (file)
@@ -108,7 +108,7 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
 {
        ssize_t retval;
        struct file *file = iocb->ki_filp;
-       struct inode *inode = file->f_dentry->d_inode;
+       struct inode *inode = file->f_path.dentry->d_inode;
        int err, pos;
        size_t count = iocb->ki_left;
 
@@ -263,6 +263,6 @@ const struct file_operations udf_file_operations = {
        .sendfile               = generic_file_sendfile,
 };
 
-struct inode_operations udf_file_inode_operations = {
+const struct inode_operations udf_file_inode_operations = {
        .truncate               = udf_truncate,
 };