Merge branch 'aufs5.4/00base' into aufs5.5/00base

Documentation/ABI/testing/debugfs-aufs

@@ -28,7 +28,7 @@ Description:
 		When the aufs mount option 'noxino' is specified, it
 		will be empty. About XINO files, see the aufs manual.
 
-What:		/debug/aufs/si_<id>/xi0, xi1 ... xiN and xiN-N
+What:		/debug/aufs/si_<id>/xi<branch-index>
 Date:		March 2009
 Contact:	J. R. Okajima <hooanon05g@gmail.com>
 Description:

Documentation/ABI/testing/sysfs-aufs

@@ -6,14 +6,14 @@ Description:
 		per aufs mount, where <id> is a unique id generated
 		internally.
 
-What:		/sys/fs/aufs/si_<id>/br0, br1 ... brN
+What:		/sys/fs/aufs/si_<id>/br<idx>
 Date:		March 2009
 Contact:	J. R. Okajima <hooanon05g@gmail.com>
 Description:
 		It shows the abolute path of a member directory (which
 		is called branch) in aufs, and its permission.
 
-What:		/sys/fs/aufs/si_<id>/brid0, brid1 ... bridN
+What:		/sys/fs/aufs/si_<id>/brid<idx>
 Date:		July 2013
 Contact:	J. R. Okajima <hooanon05g@gmail.com>
 Description:

fs/aufs/f_op.c

@@ -401,6 +401,15 @@ out:
 	return err;
 }
 
+/*
+ * We may be able to remove aufs_splice_{read,write}() since almost all FSes
+ * don't have their own .splice_{read,write} implimentations, and they use
+ * generic_file_splice_read() and iter_file_splice_write() who can act like the
+ * simple converters to f_op->iter_read() and ->iter_write().
+ * But we keep our own implementations because some non-mainlined FSes may have
+ * their own .splice_{read,write} implimentations and aufs doesn't want to take
+ * away an opportunity to co-work with aufs from them.
+ */
 static ssize_t aufs_splice_read(struct file *file, loff_t *ppos,
 				struct pipe_inode_info *pipe, size_t len,
 				unsigned int flags)