Commit 9c43ff44 authored by Jeff Layton's avatar Jeff Layton Committed by Ilya Dryomov
Browse files

ceph: convert to noop_direct_IO 



We have our own op, but the WARN_ON is not terribly helpful, and it's
otherwise identical to the noop one. Just use that.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatarIlya Dryomov <idryomov@gmail.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 8bb7eca9

fs/ceph/addr.c

+1 −12
Original line number Diff line number Diff line
@@ -1306,17 +1306,6 @@ static int ceph_write_end(struct file *file, struct address_space *mapping, 
	return copied;

}



/*

 * we set .direct_IO to indicate direct io is supported, but since we

 * intercept O_DIRECT reads and writes early, this function should

 * never get called.

 */

static ssize_t ceph_direct_io(struct kiocb *iocb, struct iov_iter *iter)

{

	WARN_ON(1);

	return -EINVAL;

}



const struct address_space_operations ceph_aops = {

	.readpage = ceph_readpage,

	.readahead = ceph_readahead,
@@ -1327,7 +1316,7 @@ const struct address_space_operations ceph_aops = { 
	.set_page_dirty = ceph_set_page_dirty,

	.invalidatepage = ceph_invalidatepage,

	.releasepage = ceph_releasepage,

	.direct_IO = ceph_direct_io,

	.direct_IO = noop_direct_IO,

};



static void ceph_block_sigs(sigset_t *oldset)