Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1fc93b7 authored by wang di's avatar wang di Committed by Greg Kroah-Hartman
Browse files

staging: lustre: llite: report back to user bad stripe count 



If the user is requesting a stripe count larger than what
is supported in the file system then report back to the
user an error as well as what is the largest possible
striping.

Signed-off-by: default avatarwang di <di.wang@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6602
Reviewed-on: http://review.whamcloud.com/15162


Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 51cfb8c4

drivers/staging/lustre/lustre/llite/dir.c

+12 −0
Original line number Diff line number Diff line
@@ -1195,6 +1195,7 @@ static long ll_dir_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		struct lmv_user_md *tmp = NULL;

		union lmv_mds_md *lmm = NULL;

		u64 valid = 0;

		int max_stripe_count;

		int stripe_count;

		int mdt_index;

		int lum_size;
@@ -1206,6 +1207,7 @@ static long ll_dir_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		if (copy_from_user(&lum, ulmv, sizeof(*ulmv)))

			return -EFAULT;



		max_stripe_count = lum.lum_stripe_count;

		/*

		 * lum_magic will indicate which stripe the ioctl will like

		 * to get, LMV_MAGIC_V1 is for normal LMV stripe, LMV_USER_MAGIC
@@ -1240,6 +1242,16 @@ static long ll_dir_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		}



		stripe_count = lmv_mds_md_stripe_count_get(lmm);

		if (max_stripe_count < stripe_count) {

			lum.lum_stripe_count = stripe_count;

			if (copy_to_user(ulmv, &lum, sizeof(lum))) {

				rc = -EFAULT;

				goto finish_req;

			}

			rc = -E2BIG;

			goto finish_req;

		}



		lum_size = lmv_user_md_size(stripe_count, LMV_MAGIC_V1);

		tmp = kzalloc(lum_size, GFP_NOFS);

		if (!tmp) {