am aa4df5c4: Merge "Handle BLKDISCARD failures" (cd391c23) · Commits · e / os / android_bootable_recovery

updater/blockimg.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1485,7 +1485,6 @@ static int PerformCommandErase(CommandParameters* params) {

		if (!S_ISBLK(st.st_mode)) {
		fprintf(stderr, "not a block device; skipping erase\n");
		rc = 0;
		goto pceout;
		}

		@@ -1509,7 +1508,7 @@ static int PerformCommandErase(CommandParameters* params) {

		if (ioctl(params->fd, BLKDISCARD, &blocks) == -1) {
		fprintf(stderr, "BLKDISCARD ioctl failed: %s\n", strerror(errno));
		// Continue anyway, nothing we can do
		goto pceout;
		}
		}
		}