diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-09-30 10:47:21 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-09-30 10:47:21 +1000 |
| commit | afcc0458547010b1a5ba6647c4830e6e2152ea81 (patch) | |
| tree | d355fe8e9bd8f0f2da3c105a66016d8314efa633 | |
| parent | dadc1da76b4ed88a1286893e1f1d958c2c7a00d4 (diff) | |
| parent | b96728705f91ca529f296ebe4e9d99db0733173f (diff) | |
| download | devel-afcc0458547010b1a5ba6647c4830e6e2152ea81.tar.gz | |
Merge branch 'master' of git://github.com/ceph/ceph-client.git
| -rw-r--r-- | fs/ceph/addr.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 99b80b5c7a931c..b4292043141969 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -1306,17 +1306,6 @@ out: 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) |