From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3AC684CC27F for ; Sun, 18 Oct 2026 14:33:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792334037; cv=none; b=un7y/fzmC+mPjZUGDd/pg4V0DIl51wHgIqTGvGiUeGFa5iBmtIBDN+DuuPyPw8StyWt1yM9MaBIm5V2V/HgcobkAMWQ+W06UrH1cSTi5BL3LtqpFzTu2sVaoDCTZqHRo1M/AHQLnj2C8rWiTcyv8gsMrlPa5wZ4eQ9JWT3RLckA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792334037; c=relaxed/simple; bh=GgEfCRe9Mq5AfQWZRxyNk+ulmAFrQF4PN0p9TFK/yRc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=a5IiWnrsuWOjrpUXWQold40H2dhkLd5v0As2DjCOIY6M48DYO3D04rqGbQ377wz2RWnJ0yTbzbL5gyqSICe0evlUk8PS0G0dE3wW32Pfcfkbb8dLgC6DVvXZFyHuXjJZ+32JqahfjNg0+prJPFO00jxSsGpqotUTsIXK24LFh3k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=ezjwtCUE; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="ezjwtCUE" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-4a1b0168fafso786065e9.2 for ; Sun, 18 Oct 2026 07:33:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1792334033; x=1792938833; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=W3EY6tWLNkfWdqMrK2TPtiU5GIlnL/y3aV9idANXNfU=; b=ezjwtCUERb5P4d/rxVPcyJh3R3tOk3/jSw6PiFo4UqKmN6GmlvqpTP+ZCW+1ek7gRE 1ff/bu0yUWMAGARhexIgLH8GDzF6kUp8R4fwL26wD2RxvYC7JjD4ocwesqIqlsGfW7XZ 1bntPtZ6BaoaHkZrR1i8z9hEJf7tTl1KhvW7Um1AuVWb3AHeBT4Q3sWyZVqF5cm/WDfw DfijM0CimrX3hzsD3Yp+gF+3zjJIY2BOW4k6ComKDLB5n/nzPz6Ds8xZ6MOj+GcDzmJq WQ29bIAg50A4BhtFeQ6nilCNy2b1QOya1eTBhA+5v9Zz8m1LbDgckSmmol3n8wJIQEUk Idvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792334033; x=1792938833; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=W3EY6tWLNkfWdqMrK2TPtiU5GIlnL/y3aV9idANXNfU=; b=S/io2Y7Zy7Vh/tGrgL67VGryZTRpRgkBP3VmDkn/awd9NLRWBlInCZ4KKIlqZxo1e5 H8Uh3RtUKRsBltlfZG7U97+5iktZegg8vm8NJ7CtWIlcPsLkwnUQ7UsAWP5yr5wlZTZc E8MfOffoIFK1sPYvbzrDLK6+hUMOjhyH9hDiDxlb97Ni7jcrb+Ddiz6oAsD+AEildus4 EgSh5l+GfbFhJtg+GEVnlug6axZ9OtOXQ0sTvB9bmQp5Q0tw9WZkDUgFnj+Z5hrPFhUI 1RdKRx1OTKEw5MQRULyPu92Vy+RKDFGgIoK7P7v0QiXjKQ103tTElYsCMzjtoOD9tb6j utBg== X-Forwarded-Encrypted: i=1; AKwUvBwiX582AXQAs2CCDUYstprKYoojsLqb1MAtNr6V54zAQbXe7j6D4Wyohdcgzo8qVj1dS1lLcgcd2Mb/sXg=@vger.kernel.org X-Gm-Message-State: AFq9FYIgP+/iEZnv8gkGhBALBVcwZOpV1U0X7ZoGnSSy9Q/40foFLJRO La4vmFuaSRdOMzv6mpE54HWuTGtt6j6DJbvV0fzRfjoqflGa26zvKP+uBGXwnMVeFIPMvTyZL/V J459+5Xeorg== X-Gm-Gg: AYBFou2NtOeAr0WR7cPQLLO1HWkyQJFOjH4rG1VlbgvDZ3mtQE7zS7ribW6bpn2EJx/ tlqzdmuqWULELb9Pt1SqxsrUEeNttibb/kDTCpCkI2LmnIF+pTOzYbvBkA1WVSbX44+YkTFFaor TGrDbdM4vCf129DDzzKlw0LSnbyUiFx6plIYo/xIyIAJQrqK+8BgF+Ni75YI4iqZNJ6/8Fq3Afj RHFwLo+gO2j5AE6knZwm8SduixepJdUIESAjBB+uxlcDhwsJfHkiN4IOxotOUKZnBbRFLaOVg8M kpBWsstwAdNu22xsvCk/3L7Ggsl5N1zVCYd9xucHXGq3SssYbh79NPv4k5mf3CeoW2uQSpAUeSe rp9ci6cP8FUKf6Ix5ODaBY5lO3SOrIK81Ep4TzMo5ZOx2Dy0oADkK+o53wXvhAoi/BH2UKKFQ3s vPFvhfbNM4vA1i6Y57XtLzGr71DQR2ylM38HW+n1vOKnt7BbgVkwkY0roTTTn4Y4B2HRWwxuk1v a/YzqbQwNwK X-Received: by 2002:a05:600c:3512:b0:4a1:b027:99ef with SMTP id 5b1f17b1804b1-4a1d7601f29mr99720315e9.2.1792334033298; Sun, 18 Oct 2026 07:33:53 -0700 (PDT) Received: from localhost.localdomain ([202.127.77.110]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3ac947928b4sm16339501a91.11.2026.10.18.07.33.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Oct 2026 07:33:51 -0700 (PDT) From: Heming Zhao To: joseph.qi@linux.alibaba.com, mark@fasheh.com, jlbec@evilplan.org, hch@lst.de Cc: Heming Zhao , ocfs2-devel@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [RFC PATCH v3 4/4] ocfs2: remove legacy blockdev direct-IO path APIs Date: Sun, 18 Oct 2026 22:33:16 +0800 Message-ID: <20261018143319.22329-5-heming.zhao@suse.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261018143319.22329-1-heming.zhao@suse.com> References: <20261018143319.22329-1-heming.zhao@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Since the DIO path already migrated from buffer_head mode (by using a_ops->direct_IO method) to iomap mode, the VFS no longer sets FMODE_CAN_ODIRECT automatically, so ocfs2_file_open() sets it explicitly. The now-unused blockdev get_block/end_io machinery (ocfs2_lock_get_block(), ocfs2_dio_wr_get_block(), ocfs2_dio_end_io(), ocfs2_dio_end_io_write(), and the ocfs2_dio_write_ctxt helpers) is removed, and OCFS2_FS Kconfig removes LEGACY_DIRECT_IO. Co-developed-by: Joseph Qi Signed-off-by: Joseph Qi Signed-off-by: Heming Zhao --- fs/ocfs2/Kconfig | 1 - fs/ocfs2/aops.c | 411 ----------------------------------------------- fs/ocfs2/aops.h | 35 +--- fs/ocfs2/file.c | 15 +- fs/ocfs2/ocfs2.h | 5 - 5 files changed, 18 insertions(+), 449 deletions(-) diff --git a/fs/ocfs2/Kconfig b/fs/ocfs2/Kconfig index bf1678a5eb01..74bc2008ef0b 100644 --- a/fs/ocfs2/Kconfig +++ b/fs/ocfs2/Kconfig @@ -9,7 +9,6 @@ config OCFS2_FS select QUOTA_TREE select FS_IOMAP select FS_POSIX_ACL - select LEGACY_DIRECT_IO help OCFS2 is a general purpose extent based shared disk cluster file system with many similarities to ext3. It supports 64 bit inode diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 6564b3251b28..ba63d983b6d6 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -114,19 +114,6 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock, return err; } -static int ocfs2_lock_get_block(struct inode *inode, sector_t iblock, - struct buffer_head *bh_result, int create) -{ - int ret = 0; - struct ocfs2_inode_info *oi = OCFS2_I(inode); - - down_read(&oi->ip_alloc_sem); - ret = ocfs2_get_block(inode, iblock, bh_result, create); - up_read(&oi->ip_alloc_sem); - - return ret; -} - int ocfs2_map_blocks(struct inode *inode, struct ocfs2_map_block *map, int flags) { @@ -2159,203 +2146,6 @@ static int ocfs2_write_end(const struct kiocb *iocb, return ret; } -struct ocfs2_dio_write_ctxt { - struct list_head dw_zero_list; - unsigned dw_zero_count; - int dw_orphaned; - pid_t dw_writer_pid; -}; - -static struct ocfs2_dio_write_ctxt * -ocfs2_dio_alloc_write_ctx(struct buffer_head *bh, int *alloc) -{ - struct ocfs2_dio_write_ctxt *dwc = NULL; - - if (bh->b_private) - return bh->b_private; - - dwc = kmalloc_obj(struct ocfs2_dio_write_ctxt, GFP_NOFS); - if (dwc == NULL) - return NULL; - INIT_LIST_HEAD(&dwc->dw_zero_list); - dwc->dw_zero_count = 0; - dwc->dw_orphaned = 0; - dwc->dw_writer_pid = task_pid_nr(current); - bh->b_private = dwc; - *alloc = 1; - - return dwc; -} - -static void ocfs2_dio_free_write_ctx(struct inode *inode, - struct ocfs2_dio_write_ctxt *dwc) -{ - ocfs2_free_unwritten_list(inode, &dwc->dw_zero_list); - kfree(dwc); -} - -/* - * TODO: Make this into a generic get_blocks function. - * - * From do_direct_io in direct-io.c: - * "So what we do is to permit the ->get_blocks function to populate - * bh.b_size with the size of IO which is permitted at this offset and - * this i_blkbits." - * - * This function is called directly from get_more_blocks in direct-io.c. - * - * called like this: dio->get_blocks(dio->inode, fs_startblk, - * fs_count, map_bh, dio->rw == WRITE); - */ -static int ocfs2_dio_wr_get_block(struct inode *inode, sector_t iblock, - struct buffer_head *bh_result, int create) -{ - struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); - struct ocfs2_inode_info *oi = OCFS2_I(inode); - struct ocfs2_write_ctxt *wc; - struct ocfs2_write_cluster_desc *desc = NULL; - struct ocfs2_dio_write_ctxt *dwc = NULL; - struct buffer_head *di_bh = NULL; - u64 p_blkno = 0; - unsigned int i_blkbits = inode->i_sb->s_blocksize_bits; - loff_t pos = iblock << i_blkbits; - sector_t endblk = (i_size_read(inode) - 1) >> i_blkbits; - unsigned len, total_len = bh_result->b_size; - int ret = 0, first_get_block = 0; - - len = osb->s_clustersize - (pos & (osb->s_clustersize - 1)); - len = min(total_len, len); - - /* - * bh_result->b_size is count in get_more_blocks according to write - * "pos" and "end", we need map twice to return different buffer state: - * 1. area in file size, not set NEW; - * 2. area out file size, set NEW. - * - * iblock endblk - * |--------|---------|---------|--------- - * |<-------area in file------->| - */ - - if ((iblock <= endblk) && - ((iblock + ((len - 1) >> i_blkbits)) > endblk)) - len = (endblk - iblock + 1) << i_blkbits; - - mlog(0, "get block of %llu at %llu:%u req %u\n", - inode->i_ino, pos, len, total_len); - - /* - * Because we need to change file size in ocfs2_dio_end_io_write(), or - * we may need to add it to orphan dir. So can not fall to fast path - * while file size will be changed. - */ - if (pos + total_len <= i_size_read(inode)) { - - /* This is the fast path for re-write. */ - ret = ocfs2_lock_get_block(inode, iblock, bh_result, create); - if (buffer_mapped(bh_result) && - !buffer_new(bh_result) && - ret == 0) - goto out; - - /* Clear state set by ocfs2_get_block. */ - bh_result->b_state = 0; - } - - dwc = ocfs2_dio_alloc_write_ctx(bh_result, &first_get_block); - if (unlikely(dwc == NULL)) { - ret = -ENOMEM; - mlog_errno(ret); - goto out; - } - - if (ocfs2_clusters_for_bytes(inode->i_sb, pos + total_len) > - ocfs2_clusters_for_bytes(inode->i_sb, i_size_read(inode)) && - !dwc->dw_orphaned) { - /* - * when we are going to alloc extents beyond file size, add the - * inode to orphan dir, so we can recall those spaces when - * system crashed during write. - */ - ret = ocfs2_add_inode_to_orphan(osb, inode); - if (ret < 0) { - mlog_errno(ret); - goto out; - } - dwc->dw_orphaned = 1; - } - - ret = ocfs2_inode_lock(inode, &di_bh, 1); - if (ret) { - mlog_errno(ret); - goto out; - } - - down_write(&oi->ip_alloc_sem); - - if (first_get_block) { - if (ocfs2_sparse_alloc(osb)) - ret = ocfs2_zero_tail(inode, di_bh, pos); - else - ret = ocfs2_expand_nonsparse_inode(inode, di_bh, pos, - total_len, NULL); - if (ret < 0) { - mlog_errno(ret); - goto unlock; - } - } - - ret = ocfs2_write_begin_nolock(inode->i_mapping, pos, len, - OCFS2_WRITE_DIRECT, NULL, - (void **)&wc, di_bh, NULL); - if (ret) { - mlog_errno(ret); - goto unlock; - } - - desc = &wc->w_desc[0]; - - p_blkno = ocfs2_clusters_to_blocks(inode->i_sb, desc->c_phys); - BUG_ON(p_blkno == 0); - p_blkno += iblock & (u64)(ocfs2_clusters_to_blocks(inode->i_sb, 1) - 1); - - map_bh(bh_result, inode->i_sb, p_blkno); - bh_result->b_size = len; - if (desc->c_needs_zero) - set_buffer_new(bh_result); - - if (iblock > endblk) - set_buffer_new(bh_result); - - /* May sleep in end_io. It should not happen in a irq context. So defer - * it to dio work queue. */ - set_buffer_defer_completion(bh_result); - - if (!list_empty(&wc->w_unwritten_list)) { - struct ocfs2_unwritten_extent *ue = NULL; - - ue = list_first_entry(&wc->w_unwritten_list, - struct ocfs2_unwritten_extent, - ue_node); - BUG_ON(ue->ue_cpos != desc->c_cpos); - /* The physical address may be 0, fill it. */ - ue->ue_phys = desc->c_phys; - - list_splice_tail_init(&wc->w_unwritten_list, &dwc->dw_zero_list); - dwc->dw_zero_count += wc->w_unwritten_count; - } - - ret = ocfs2_write_end_nolock(inode->i_mapping, pos, len, len, wc); - BUG_ON(ret != len); - ret = 0; -unlock: - up_write(&oi->ip_alloc_sem); - ocfs2_inode_unlock(inode, 1); - brelse(di_bh); -out: - return ret; -} - /* * Prepare the area between i_size and a direct write that starts or ends * beyond it. Must be called once per dio, before any io is issued, with @@ -2391,7 +2181,6 @@ int ocfs2_dio_zero_eof(struct inode *inode, loff_t pos, size_t count) return ret; } -/* copy from ocfs2_dio_wr_get_block */ static int ocfs2_dio_wr_map_blocks(struct inode *inode, struct ocfs2_map_block *map, int create) { @@ -2533,205 +2322,6 @@ static int ocfs2_dio_wr_map_blocks(struct inode *inode, return ret; } -static int ocfs2_dio_end_io_write(struct inode *inode, - struct ocfs2_dio_write_ctxt *dwc, - loff_t offset, - ssize_t bytes) -{ - struct ocfs2_cached_dealloc_ctxt dealloc; - struct ocfs2_extent_tree et; - struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); - struct ocfs2_inode_info *oi = OCFS2_I(inode); - struct ocfs2_unwritten_extent *ue = NULL; - struct buffer_head *di_bh = NULL; - struct ocfs2_dinode *di; - struct ocfs2_alloc_context *data_ac = NULL; - struct ocfs2_alloc_context *meta_ac = NULL; - handle_t *handle = NULL; - loff_t end = offset + bytes; - int ret = 0, credits = 0, batch = 0; - - ocfs2_init_dealloc_ctxt(&dealloc); - - /* We do clear unwritten, delete orphan, change i_size here. If neither - * of these happen, we can skip all this. */ - if (list_empty(&dwc->dw_zero_list) && - end <= i_size_read(inode) && - !dwc->dw_orphaned) - goto out; - - ret = ocfs2_inode_lock(inode, &di_bh, 1); - if (ret < 0) { - mlog_errno(ret); - goto out; - } - - down_write(&oi->ip_alloc_sem); - di = (struct ocfs2_dinode *)di_bh->b_data; - - ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode), di_bh); - - /* Attach dealloc with extent tree in case that we may reuse extents - * which are already unlinked from current extent tree due to extent - * rotation and merging. - */ - et.et_dealloc = &dealloc; - - ret = ocfs2_lock_allocators(inode, &et, 0, dwc->dw_zero_count*2, - &data_ac, &meta_ac); - if (ret) { - mlog_errno(ret); - goto unlock; - } - - credits = ocfs2_calc_extend_credits(inode->i_sb, &di->id2.i_list); - - list_for_each_entry(ue, &dwc->dw_zero_list, ue_node) { - if (!handle) { - handle = ocfs2_start_trans(osb, credits); - if (IS_ERR(handle)) { - ret = PTR_ERR(handle); - mlog_errno(ret); - goto unlock; - } - ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), di_bh, - OCFS2_JOURNAL_ACCESS_WRITE); - if (ret) { - mlog_errno(ret); - goto commit; - } - } - ret = ocfs2_assure_trans_credits(handle, credits); - if (ret < 0) { - mlog_errno(ret); - goto commit; - } - ret = ocfs2_mark_extent_written(inode, &et, handle, - ue->ue_cpos, 1, - ue->ue_phys, - meta_ac, &dealloc); - if (ret < 0) { - mlog_errno(ret); - goto commit; - } - - if (++batch == OCFS2_DIO_MARK_EXTENT_BATCH) { - ocfs2_commit_trans(osb, handle); - handle = NULL; - batch = 0; - } - } - - if (end > i_size_read(inode)) { - if (!handle) { - handle = ocfs2_start_trans(osb, credits); - if (IS_ERR(handle)) { - ret = PTR_ERR(handle); - mlog_errno(ret); - goto unlock; - } - } - ret = ocfs2_set_inode_size(handle, inode, di_bh, end); - if (ret < 0) - mlog_errno(ret); - } - -commit: - if (handle) - ocfs2_commit_trans(osb, handle); -unlock: - up_write(&oi->ip_alloc_sem); - - if (data_ac) { - ocfs2_free_alloc_context(data_ac); - data_ac = NULL; - } - if (meta_ac) { - ocfs2_free_alloc_context(meta_ac); - meta_ac = NULL; - } - - /* everything looks good, let's start the cleanup */ - if (!ret && dwc->dw_orphaned) { - BUG_ON(dwc->dw_writer_pid != task_pid_nr(current)); - - ret = ocfs2_del_inode_from_orphan(osb, inode, di_bh, 0, 0); - if (ret < 0) - mlog_errno(ret); - } - ocfs2_inode_unlock(inode, 1); - brelse(di_bh); -out: - ocfs2_run_deallocs(osb, &dealloc); - ocfs2_dio_free_write_ctx(inode, dwc); - - return ret; -} - -/* - * ocfs2_dio_end_io is called by the dio core when a dio is finished. We're - * particularly interested in the aio/dio case. We use the rw_lock DLM lock - * to protect io on one node from truncation on another. - */ -static int ocfs2_dio_end_io(struct kiocb *iocb, - loff_t offset, - ssize_t bytes, - void *private) -{ - struct inode *inode = file_inode(iocb->ki_filp); - int level; - int ret = 0; - - /* this io's submitter should not have unlocked this before we could */ - BUG_ON(!ocfs2_iocb_is_rw_locked(iocb)); - - if (bytes <= 0) - mlog_ratelimited(ML_ERROR, "Direct IO failed, bytes = %lld", - (long long)bytes); - if (private) { - if (bytes > 0) - ret = ocfs2_dio_end_io_write(inode, private, offset, - bytes); - else - ocfs2_dio_free_write_ctx(inode, private); - } - - ocfs2_iocb_clear_rw_locked(iocb); - - level = ocfs2_iocb_rw_locked_level(iocb); - ocfs2_rw_unlock(inode, level); - return ret; -} - -static ssize_t ocfs2_direct_IO(struct kiocb *iocb, struct iov_iter *iter) -{ - struct file *file = iocb->ki_filp; - struct inode *inode = file->f_mapping->host; - struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); - get_block_t *get_block; - - /* - * Fallback to buffered I/O if we see an inode without - * extents. - */ - if (OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL) - return 0; - - /* Fallback to buffered I/O if we do not support append dio. */ - if (iocb->ki_pos + iter->count > i_size_read(inode) && - !ocfs2_supports_append_dio(osb)) - return 0; - - if (iov_iter_rw(iter) == READ) - get_block = ocfs2_lock_get_block; - else - get_block = ocfs2_dio_wr_get_block; - - return __blockdev_direct_IO(iocb, inode, inode->i_sb->s_bdev, - iter, get_block, - ocfs2_dio_end_io, 0); -} - static int ocfs2_iomap_alloc(struct inode *inode, struct ocfs2_map_block *map, unsigned int flags) { @@ -3066,7 +2656,6 @@ const struct address_space_operations ocfs2_aops = { .write_begin = ocfs2_write_begin, .write_end = ocfs2_write_end, .bmap = ocfs2_bmap, - .direct_IO = ocfs2_direct_IO, .invalidate_folio = block_invalidate_folio, .release_folio = ocfs2_release_folio, .migrate_folio = buffer_migrate_folio, diff --git a/fs/ocfs2/aops.h b/fs/ocfs2/aops.h index b46ba4df1428..11100421d924 100644 --- a/fs/ocfs2/aops.h +++ b/fs/ocfs2/aops.h @@ -7,6 +7,12 @@ #define OCFS2_AOPS_H #include +#include + +extern const struct iomap_ops ocfs2_iomap_ops; +extern const struct iomap_dio_ops ocfs2_iomap_dio_ops_r_pr; +extern const struct iomap_dio_ops ocfs2_iomap_dio_ops_w_pr; +extern const struct iomap_dio_ops ocfs2_iomap_dio_ops_w_ex; int ocfs2_map_folio_blocks(struct folio *folio, u64 *p_blkno, struct inode *inode, unsigned int from, @@ -45,34 +51,5 @@ int ocfs2_get_block(struct inode *inode, sector_t iblock, int ocfs2_dio_zero_eof(struct inode *inode, loff_t pos, size_t count); int ocfs2_map_blocks(struct inode *inode, struct ocfs2_map_block *map, int flags); -/* all ocfs2_dio_end_io()'s fault */ -#define ocfs2_iocb_is_rw_locked(iocb) \ - test_bit(0, (unsigned long *)&iocb->private) -static inline void ocfs2_iocb_set_rw_locked(struct kiocb *iocb, int level) -{ - set_bit(0, (unsigned long *)&iocb->private); - if (level) - set_bit(1, (unsigned long *)&iocb->private); - else - clear_bit(1, (unsigned long *)&iocb->private); -} - -/* - * Using a named enum representing lock types in terms of #N bit stored in - * iocb->private, which is going to be used for communication between - * ocfs2_dio_end_io() and ocfs2_file_write/read_iter(). - */ -enum ocfs2_iocb_lock_bits { - OCFS2_IOCB_RW_LOCK = 0, - OCFS2_IOCB_RW_LOCK_LEVEL, - OCFS2_IOCB_NUM_LOCKS -}; - -#define ocfs2_iocb_init_rw_locked(iocb) \ - (iocb->private = NULL) -#define ocfs2_iocb_clear_rw_locked(iocb) \ - clear_bit(OCFS2_IOCB_RW_LOCK, (unsigned long *)&iocb->private) -#define ocfs2_iocb_rw_locked_level(iocb) \ - test_bit(OCFS2_IOCB_RW_LOCK_LEVEL, (unsigned long *)&iocb->private) #endif /* OCFS2_FILE_H */ diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 8ac15ea58cc6..9c012a880908 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -129,6 +129,15 @@ static int ocfs2_file_open(struct inode *inode, struct file *file) file->f_mode |= FMODE_NOWAIT; + /* + * Direct I/O is served through iomap_dio_rw() from + * ocfs2_file_{read,write}_iter() rather than an a_ops->direct_IO + * method, so advertise O_DIRECT capability explicitly here. + */ + if (!(OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL)) + file->f_mode |= FMODE_CAN_ODIRECT; + + leave: return status; } @@ -1171,9 +1180,9 @@ int ocfs2_setattr(struct mnt_idmap *idmap, struct dentry *dentry, size_change = S_ISREG(inode->i_mode) && attr->ia_valid & ATTR_SIZE; if (size_change) { /* - * Here we should wait dio to finish before inode lock - * to avoid a deadlock between ocfs2_setattr() and - * ocfs2_dio_end_io_write() + * Here we should wait for in-flight direct I/O to finish + * before taking the inode lock, to avoid a deadlock between + * ocfs2_setattr() and direct I/O completion. */ inode_dio_wait(inode); diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h index b228b10b5e71..095f7ae5dded 100644 --- a/fs/ocfs2/ocfs2.h +++ b/fs/ocfs2/ocfs2.h @@ -549,11 +549,6 @@ struct ocfs2_map_block { unsigned int flags; }; -extern const struct iomap_ops ocfs2_iomap_ops; -extern const struct iomap_dio_ops ocfs2_iomap_dio_ops_r_pr; -extern const struct iomap_dio_ops ocfs2_iomap_dio_ops_w_pr; -extern const struct iomap_dio_ops ocfs2_iomap_dio_ops_w_ex; - /* Flags used by ocfs2_map_blocks() */ #define OCFS2_GET_BLOCKS_CREATE (0x0001) -- 2.55.0