Merge branch 'aufs5.2/11mmap' into aufs5.3/11mmap

Signed-off-by: J. R. Okajima <[email protected]>

# Conflicts:
#	fs/aufs/branch.c

Author: sfjro

fs/aufs/branch.c

@@ -1277,11 +1277,10 @@ static int au_br_mod_files_ro(struct super_block *sb, aufs_bindex_t bindex)
 		spin_unlock(&hf->f_lock);
 		if (writer) {
 			h_inode = file_inode(hf);
+			if (hf->f_mode & FMODE_READ)
+				i_readcount_inc(h_inode);
 			put_write_access(h_inode);
 			__mnt_drop_write(hf->f_path.mnt);
-			if ((hf->f_mode & (FMODE_READ | FMODE_WRITE))
-			    == FMODE_READ)
-				i_readcount_inc(h_inode);
 		}
 	}
 

fs/aufs/vfsub.c

@@ -63,15 +63,8 @@ int vfsub_update_h_iattr(struct path *h_path, int *did)
 
 struct file *vfsub_dentry_open(struct path *path, int flags)
 {
-	struct file *file;
-
-	file = dentry_open(path, flags /* | __FMODE_NONOTIFY */,
+	return dentry_open(path, flags /* | __FMODE_NONOTIFY */,
 			   current_cred());
-	if (!IS_ERR_OR_NULL(file)
-	    && (file->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)
-		i_readcount_inc(d_inode(path->dentry));
-
-	return file;
 }
 
 struct file *vfsub_filp_open(const char *path, int oflags, int mode)