Commit ba420f35 authored Aug 02, 2017 by Greg Kroah-Hartman

ext4: ext4_encrypted_zeroout: fix merge error with duplicated call



In ext4_encrypted_zeroout(), submit_bio_wait() gets called twice in a
row.  This seems to be a merge error between commit bd425361 ("ext4
crypto: add ext4 encryption facilities") and c9e01ad4 ("ext4 crypto:
fix bugs in ext4_encrypted_zeroout()")

Remove the duplicated call.

Cc: Signed-off-by: Michael Halcrow <mhalcrow@google.com>
Cc: Ildar Muslukhov <ildarm@google.com>
Cc: "Theodore Ts'o" <tytso@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

parent 93c7345c

fs/ext4/crypto.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -444,7 +444,6 @@ int ext4_encrypted_zeroout(struct inode inode, struct ext4_extent ex)
		goto errout;
		}
		err = submit_bio_wait(WRITE, bio);
		err = submit_bio_wait(WRITE, bio);
		if ((err == 0) && !test_bit(BIO_UPTODATE, &bio->bi_flags))
		err = -EIO;
		bio_put(bio);