Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (5ac4d630) · Commits · e / devices / android_kernel_xiaomi_markw

block/blk-settings.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -554,11 +554,18 @@ int blk_stack_limits(struct queue_limits t, struct queue_limits b,
		ret = -1;
		}

		/*
		* Temporarily disable discard granularity. It's currently buggy
		* since we default to 0 for discard_granularity, hence this
		* "failure" will always trigger for non-zero offsets.
		*/
		#if 0
		if (offset &&
		(offset & (b->discard_granularity - 1)) != b->discard_alignment) {
		t->discard_misaligned = 1;
		ret = -1;
		}
		#endif

		/* If top has no alignment offset, inherit from bottom */
		if (!t->alignment_offset)