On Wed, Oct 31, 2018 at 12:48:20PM +0100, Miklos Szeredi wrote:
> Also my feeling is that the option dependency thing is still too
> complicated. Why can't we just implicitly enable redirects if
> metacopy is enabled? Example: foo=off option is conflicting with
> foo=on, yet we just take the one which came later, don't warn or error
> out. Similarly metacopy=on should just imply redirect_dir=on and
> redirect_dir=off should imply metacopy=off. And document this
> dependency, of course.
Something like this? Untested, and incomplete:
- show options needs to kill the implied ones
- what's with "metacopy=on,redirect=follow"?
Thanks,
Miklos
---
fs/overlayfs/super.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -312,7 +312,7 @@ static bool ovl_force_readonly(struct ov
static const char *ovl_redirect_mode_def(void)
{
- return ovl_redirect_dir_def ? "on" : "off";
+ return ovl_redirect_dir_def || ovl_metacopy_def ? "on" : "off";
}
enum {
@@ -516,6 +516,11 @@ static int ovl_parse_opt(char *opt, stru
config->redirect_mode = match_strdup(&args[0]);
if (!config->redirect_mode)
return -ENOMEM;
+
+ /* "redirect_dir=off" implies "metacopy=off" */
+ if (strcmp(config->redirect_mode, "off") == 0 ||
+ strcmp(config->redirect_mode, "nofollow") == 0)
+ config->metacopy = false;
break;
case OPT_INDEX_ON:
@@ -548,6 +553,12 @@ static int ovl_parse_opt(char *opt, stru
case OPT_METACOPY_ON:
config->metacopy = true;
+
+ /* "metacopy=on" implies "redirect_dir=on" */
+ kfree(config->redirect_mode);
+ config->redirect_mode = kstrdup("on", GFP_KERNEL);
+ if (!config->redirect_mode)
+ return -ENOMEM;
break;
case OPT_METACOPY_OFF:
