summaryrefslogtreecommitdiff
authorJaegeuk Kim <jaegeuk@google.com>2019-05-23 19:28:29 (GMT)
committer Jaegeuk Kim <jaegeuk@google.com>2019-05-23 19:28:29 (GMT)
commit8e2c08d176f9d6e20881b3a5647f53a773458a41 (patch)
treecb965bff12583d3db12274af861a092ed944b020
parentdf08e3476a03c71710472f6e29dd41ded8e8fd10 (diff)
parent6566a54687b340936e943ed3a341d8e7099ff324 (diff)
downloadcommon-8e2c08d176f9d6e20881b3a5647f53a773458a41.zip
common-8e2c08d176f9d6e20881b3a5647f53a773458a41.tar.gz
common-8e2c08d176f9d6e20881b3a5647f53a773458a41.tar.bz2
Merge remote-tracking branch 'origin/upstream-f2fs-stable-linux-4.9.y' into android-4.9
* origin/upstream-f2fs-stable-linux-4.9.y: ext4: fix build warning Change-Id: Iebb5a46a921ff92305d84330afb8ff2e7946a18b Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Diffstat
-rw-r--r--fs/ext4/file.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index d75fc52..3badb49d 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -301,8 +301,6 @@ static const struct vm_operations_struct ext4_file_vm_ops = {
static int ext4_file_mmap(struct file *file, struct vm_area_struct *vma)
{
- struct inode *inode = file->f_mapping->host;
-
file_accessed(file);
if (IS_DAX(file_inode(file))) {
vma->vm_ops = &ext4_dax_vm_ops;