Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[firefly-linux-kernel-4.4.55.git] / fs / logfs / file.c

diff --git a/fs/logfs/file.c b/fs/logfs/file.c
index 8538752df2f6a7dbb3dad0119e4e8bc47f4a25f4..1a6f0167b16a7a4b657138ed7c366e8fe3151dfd 100644 (file)
--- a/fs/logfs/file.c
+++ b/fs/logfs/file.c
@@ -241,7 +241,7 @@ int logfs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
 
 static int logfs_setattr(struct dentry *dentry, struct iattr *attr)
 {
-       struct inode *inode = dentry->d_inode;
+       struct inode *inode = d_inode(dentry);
        int err = 0;
 
        err = inode_change_ok(inode, attr);
@@ -271,8 +271,6 @@ const struct file_operations logfs_reg_fops = {
        .llseek         = generic_file_llseek,
        .mmap           = generic_file_readonly_mmap,
        .open           = generic_file_open,
-       .read           = new_sync_read,
-       .write          = new_sync_write,
 };
 
 const struct address_space_operations logfs_reg_aops = {