From: Lai Siyao <lai.siyao@whamcloud.com>
Date: Fri, 7 Jun 2019 06:20:13 +0000 (+0800)
Subject: LU-9846 utils: hash may be overridden in 'lfs setdirstripe'
X-Git-Tag: 2.12.55~24
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=44405d4d6f7c0a77d540d6a114050ccabd0a4e9f;p=fs%2Flustre-release.git

LU-9846 utils: hash may be overridden in 'lfs setdirstripe'

lfs_setdirstripe() may override 'hash' if '-H hash' is specified
before '-i', since LMV doesn't support OVERSTRIPING, this support
can be ignored.

Fixes: 591a9b4cebc5 ("LU-9846 lod: Add overstriping support")

Signed-off-by: Lai Siyao <lai.siyao@whamcloud.com>
Change-Id: If6db03d2d4f6d208da19ae064fde1d851f01beb4
Reviewed-on: https://review.whamcloud.com/35095
Tested-by: Jenkins
Reviewed-by: Patrick Farrell <pfarrell@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
---

diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c
index 701868a..123afed 100644
--- a/lustre/utils/lfs.c
+++ b/lustre/utils/lfs.c
@@ -5324,7 +5324,6 @@ static int lfs_setdirstripe(int argc, char **argv)
 					"%s %s: warning: '--index' deprecated, use '--mdt-index' instead\n",
 					progname, argv[0]);
 #endif
-			lsa.lsa_pattern = LLAPI_LAYOUT_OVERSTRIPING;
 			lsa.lsa_nr_tgts = parse_targets(mdts,
 						sizeof(mdts) / sizeof(__u32),
 						lsa.lsa_nr_tgts, optarg, NULL);
@@ -5334,7 +5333,6 @@ static int lfs_setdirstripe(int argc, char **argv)
 					progname, argv[0], optarg);
 				return CMD_HELP;
 			}
-			lsa.lsa_pattern = 0;
 
 			lsa.lsa_tgts = mdts;
 			if (lsa.lsa_stripe_off == LLAPI_LAYOUT_DEFAULT)