Merge branch 'aufs3.11/00base' into aufs3.12/00base
Merge branch 'aufs3.11/10static' into aufs3.12/10static
Merge remote-tracking branch 'aufs3-standalone/aufs3.12/00base' into aufs3.12/10static
Merge branch 'aufs3.11/11proc_map' into aufs3.12/11proc_map

Conflicts:
	mm/Makefile

Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>
Merge branch 'aufs3.12/10static' into aufs3.12/11proc_map
backport: aufs: for linux-3.13, s_files is gone and si_files has come

In order to allow deleting a branch which has an opened dir
(d306ff4 2014-07-25 aufs: allow deleting a branch who has an opened
dir), aufs has to maintain the list of all opened files.
There was such list in linux as sb->s_files, but in linux-3.12 s_files
became containing a part of the opened files and in linux-3.13 it was
totally gone.

Here the comimit for si_files in aufs is back-ported.

(original commit log)
By the commit,
eee5cc2 2013-11-09 get rid of s_files and files_lock
the file list in superblock, s_files is totally removed.

But aufs still needs the file list, particularly for re-setting the
branch attribute from RW to RO.
After resetting to RO, aufs should return EROFS for write. In order to
support such case, aufs keeps the late s_files and mark_files_ro()
approach.

Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
(cherry picked from commit c4f445827ded3d71590e411f7e80b4af73b3483b)

Conflicts:
	fs/aufs/branch.c
	fs/aufs/sysrq.c
aufs: si_files has all opened files

In order to allow deleting a branch which has an opened dir
(d306ff4 2014-07-25 aufs: allow deleting a branch who has an opened
dir), aufs has to maintain the list of all opened files including
direcotries.

au_sphl_add()/_del() calls don't look balanced, but it is logically
balanced.

Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>
Merge remote-tracking branch 'aufs3-standalone/aufs3.12/00base' into aufs3.12/10static
Merge branch 'aufs3.12/10static' into aufs3.12/11proc_map
Merge branch 'aufs3.12/00base' into aufs3.13/00base

Conflicts:
	fs/aufs/branch.c
	fs/aufs/f_op.c

Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>
Merge branch 'aufs3.12/10static' into aufs3.13/10static

Conflicts:
	fs/aufs/branch.c
	fs/aufs/f_op.c

Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>
Merge remote-tracking branch 'aufs3-standalone/aufs3.13/00base' into aufs3.13/10static
Merge branch 'aufs3.12/11proc_map' into aufs3.13/11proc_map

Conflicts:
	fs/aufs/branch.c
	fs/aufs/f_op.c

Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>
Merge branch 'aufs3.13/10static' into aufs3.13/11proc_map
Merge branch 'aufs3.13/00base' into aufs3.14/00base
Merge branch 'aufs3.13/10static' into aufs3.14/10static
Merge remote-tracking branch 'aufs3-standalone/aufs3.14/00base' into aufs3.14/10static
Merge branch 'aufs3.13/11proc_map' into aufs3.14/11proc_map
Merge branch 'aufs3.14/10static' into aufs3.14/11proc_map
Merge branch 'aufs3.14/00base' into aufs3.15/00base