aufs: backward compatibility

They are historical options and a branch attribute.
Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

fs/aufs/opts.c

@@ -112,6 +112,10 @@ static match_table_t options = {
 	{Opt_warn_perm, "warn_perm"},
 	{Opt_nowarn_perm, "nowarn_perm"},
 
+	/* keep them temporary */
+	{Opt_ignore_silent, "nodlgt"},
+	{Opt_ignore, "clean_plink"},
+
 #ifdef CONFIG_AUFS_SHWH
 	{Opt_shwh, "shwh"},
 #endif
@@ -155,6 +159,12 @@ static match_table_t options = {
 	/* internal use for the scripts */
 	{Opt_ignore_silent, "si=%s"},
 
+	{Opt_br, "dirs=%s"},
+	{Opt_ignore, "debug=%d"},
+	{Opt_ignore, "delete=whiteout"},
+	{Opt_ignore, "delete=all"},
+	{Opt_ignore, "imap=%s"},
+
 	/* temporary workaround, due to old mount(8)? */
 	{Opt_ignore_silent, "relatime"},
 
@@ -212,6 +222,8 @@ static match_table_t brattr = {
 	/* general */
 	{AuBrAttr_COO_REG, AUFS_BRATTR_COO_REG},
 	{AuBrAttr_COO_ALL, AUFS_BRATTR_COO_ALL},
+	/* 'unpin' attrib is meaningless since linux-3.18-rc1 */
+	{AuBrAttr_UNPIN, AUFS_BRATTR_UNPIN},
 #ifdef CONFIG_AUFS_FHSM
 	{AuBrAttr_FHSM, AUFS_BRATTR_FHSM},
 #endif
@@ -327,6 +339,17 @@ static int noinline_for_stack br_perm_val(char *perm)
 		val &= ~AuBrRAttr_Mask;
 		break;
 	}
+
+	/*
+	 * 'unpin' attrib becomes meaningless since linux-3.18-rc1, but aufs
+	 * does not treat it as an error, just warning.
+	 * this is a tiny guard for the user operation.
+	 */
+	if (val & AuBrAttr_UNPIN) {
+		bad |= AuBrAttr_UNPIN;
+		val &= ~AuBrAttr_UNPIN;
+	}
+
 	if (unlikely(bad)) {
 		sz = au_do_optstr_br_attr(&attr, bad);
 		AuDebugOn(!sz);

include/uapi/linux/aufs_type.h

@@ -115,6 +115,7 @@ typedef int16_t aufs_bindex_t;
 #define AUFS_BRATTR_COO_REG	"coo_reg"
 #define AUFS_BRATTR_COO_ALL	"coo_all"
 #define AUFS_BRATTR_FHSM	"fhsm"
+#define AUFS_BRATTR_UNPIN	"unpin"
 #define AUFS_BRATTR_ICEX	"icex"
 #define AUFS_BRATTR_ICEX_SEC	"icexsec"
 #define AUFS_BRATTR_ICEX_SYS	"icexsys"
@@ -135,6 +136,9 @@ typedef int16_t aufs_bindex_t;
 #define AuBrAttr_COO_Mask	(AuBrAttr_COO_REG | AuBrAttr_COO_ALL)
 
 #define AuBrAttr_FHSM		(1 << 5)	/* file-based hsm */
+#define AuBrAttr_UNPIN		(1 << 6)	/* rename-able top dir of
+						   branch. meaningless since
+						   linux-3.18-rc1 */
 
 /* ignore error in copying XATTR */
 #define AuBrAttr_ICEX_SEC	(1 << 7)
@@ -184,6 +188,7 @@ typedef int16_t aufs_bindex_t;
 #define AuBrPermStrSz	sizeof(AUFS_BRPERM_RW			\
 			       "+" AUFS_BRATTR_COO_REG		\
 			       "+" AUFS_BRATTR_FHSM		\
+			       "+" AUFS_BRATTR_UNPIN		\
 			       "+" AUFS_BRATTR_ICEX_SEC		\
 			       "+" AUFS_BRATTR_ICEX_SYS		\
 			       "+" AUFS_BRATTR_ICEX_USR		\