Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp1491545ybi; Fri, 12 Jul 2019 17:27:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqydvr8bpnNAMhDwfz638MFORamHxZHbzY2wJmppY9oieRPylFEj67wAXmVGuGAz0wewttd+ X-Received: by 2002:a65:5c0a:: with SMTP id u10mr14517673pgr.412.1562977646806; Fri, 12 Jul 2019 17:27:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562977646; cv=none; d=google.com; s=arc-20160816; b=iBb3vOmVOTT0C4Q4pp/Ejh2xlyxCY5h0HLBJEp7O8KbT+iUSZsGSD7odVWqXXGnKig 3cu8MelX37giKptBJKb/zawYSkwITp+OiQrv2tbZ2E7jrMB5sWZbQHzmQp98EVY/c3iD rFLhx0W5f6W36R44SbqPujL57bUjhP4Pnr6POtxTHW3WKB2DDJaClYrOMwqx55/WY2LU bMm2EoWNxSRpw3vfmmkEaxBslJ7oR7hAx0zE9PnPpy7Ax9HNMs8Tj0GAVubKqIQzFQLf So5KH5MxsDwxqaLqSY6APs9/V9qhMhOd2kjA2EZnNi4rUzWKJuwbp6im5NGKFDdqVesH tpmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=jaKIxjbAtWfCIKNpxZ5GP+wTPveGTdfkrLjrN9+UosQ=; b=R0uXo+AyNVKQSUQxf1tgccmZ7jW5PEIVc+lMcLduj8pANs/TIAW1fQNMKYvQajMLjH WSRcSW5JU3AP5deiqtjjEMrbDuivSkuS3xyzpILjBd6siXItsrG8OEF0dAaWp9Tj5/Wd 5ihh3nCTUW/jdX7jOJ9rilpvAEcsCHh3dp2iZk3EL/j5/AWGKpywApQL7fqdegYEBfwP AV3NoAkoTSMR9AFEqCpEZ+xmBF8l1LfYvdo+/fXFBKoDMVnJQlKgUXOq5V9a1hrF5wmF uo9alAAuX47j65Mm4CH3rd/JtTQm32+mTdlEfE8WZJcGVU2DWi8XmgKY0bgP5cUhCclW BQ0Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f3si10210968pgs.135.2019.07.12.17.27.13; Fri, 12 Jul 2019 17:27:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727118AbfGMA0z (ORCPT + 99 others); Fri, 12 Jul 2019 20:26:55 -0400 Received: from out30-54.freemail.mail.aliyun.com ([115.124.30.54]:41704 "EHLO out30-54.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727261AbfGMA0z (ORCPT ); Fri, 12 Jul 2019 20:26:55 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R131e4;CH=green;DM=||false|;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04400;MF=joseph.qi@linux.alibaba.com;NM=1;PH=DS;RN=8;SR=0;TI=SMTPD_---0TWk3zof_1562977611; Received: from localhost(mailfrom:joseph.qi@linux.alibaba.com fp:SMTPD_---0TWk3zof_1562977611) by smtp.aliyun-inc.com(127.0.0.1); Sat, 13 Jul 2019 08:26:52 +0800 From: Joseph Qi To: akpm@linux-foundation.org Cc: Theodore Ts'o , mark@fasheh.com, jlbec@evilplan.org, Ross Zwisler , Changwei Ge , linux-ext4@vger.kernel.org, ocfs2-devel@oss.oracle.com Subject: [PATCH 2/2] jbd2: remove jbd2_journal_inode_add_[write|wait] Date: Sat, 13 Jul 2019 08:26:51 +0800 Message-Id: <1562977611-8412-2-git-send-email-joseph.qi@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1562977611-8412-1-git-send-email-joseph.qi@linux.alibaba.com> References: <1562977611-8412-1-git-send-email-joseph.qi@linux.alibaba.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Since ext4/ocfs2 are using jbd2_inode dirty range scoping APIs now, jbd2_journal_inode_add_[write|wait] are not used any more, remove them. Signed-off-by: Joseph Qi Reviewed-by: Ross Zwisler --- fs/jbd2/journal.c | 2 -- fs/jbd2/transaction.c | 12 ------------ include/linux/jbd2.h | 2 -- 3 files changed, 16 deletions(-) diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 953990e..1c58859 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -89,8 +89,6 @@ EXPORT_SYMBOL(jbd2_journal_invalidatepage); EXPORT_SYMBOL(jbd2_journal_try_to_free_buffers); EXPORT_SYMBOL(jbd2_journal_force_commit); -EXPORT_SYMBOL(jbd2_journal_inode_add_write); -EXPORT_SYMBOL(jbd2_journal_inode_add_wait); EXPORT_SYMBOL(jbd2_journal_inode_ranged_write); EXPORT_SYMBOL(jbd2_journal_inode_ranged_wait); EXPORT_SYMBOL(jbd2_journal_init_jbd_inode); diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index 990e7b5..9bf793d 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -2619,18 +2619,6 @@ static int jbd2_journal_file_inode(handle_t *handle, struct jbd2_inode *jinode, return 0; } -int jbd2_journal_inode_add_write(handle_t *handle, struct jbd2_inode *jinode) -{ - return jbd2_journal_file_inode(handle, jinode, - JI_WRITE_DATA | JI_WAIT_DATA, 0, LLONG_MAX); -} - -int jbd2_journal_inode_add_wait(handle_t *handle, struct jbd2_inode *jinode) -{ - return jbd2_journal_file_inode(handle, jinode, JI_WAIT_DATA, 0, - LLONG_MAX); -} - int jbd2_journal_inode_ranged_write(handle_t *handle, struct jbd2_inode *jinode, loff_t start_byte, loff_t length) { diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index df03825..603fbc4 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -1410,8 +1410,6 @@ extern int jbd2_journal_update_sb_log_tail (journal_t *, tid_t, extern int jbd2_journal_bmap(journal_t *, unsigned long, unsigned long long *); extern int jbd2_journal_force_commit(journal_t *); extern int jbd2_journal_force_commit_nested(journal_t *); -extern int jbd2_journal_inode_add_write(handle_t *handle, struct jbd2_inode *inode); -extern int jbd2_journal_inode_add_wait(handle_t *handle, struct jbd2_inode *inode); extern int jbd2_journal_inode_ranged_write(handle_t *handle, struct jbd2_inode *inode, loff_t start_byte, loff_t length); -- 1.8.3.1