From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60645C5B578 for ; Mon, 1 Jul 2019 21:55:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 35414206E0 for ; Mon, 1 Jul 2019 21:55:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="OlFVQPNu" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727076AbfGAVzx (ORCPT ); Mon, 1 Jul 2019 17:55:53 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:44764 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726439AbfGAVzx (ORCPT ); Mon, 1 Jul 2019 17:55:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=4KIFr9ZHaCXhARbl88sQ7wGpF7jLnr+OvF2cM11W+Cg=; b=OlFVQPNusbwK/Nvp5DbR6/I2YN aswjM2ty93qtjPSyCPr47h6qUEwC+zylWdK9/xoEkY6G0Aa01yirnPMZZTLMuLOpgptqln6SE/hcE 3UOxIHALSCayu4h5WY85lbZYpJwtZUTBUAR0uaeW/uO67Qkbe0ryGag29o11Ij+VW5IP7X3iJqiSU 13ih+jizQhMlv0oYPdq1Ab/ZxBjMBoHG9VB5bWfOHt5XeMwxWwFDpF7X1xD6YUOTXpKhXmT+1JuSJ 3XVCANi8BUUKWEMYY0fIe+8UjhHvFyjK3/kWvJc7EwRJq8idXfL+/qxSGMbGx8KNN6zQ3dWtIRd9W bQ4Z6X6w==; Received: from [38.98.37.141] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1hi4H7-0001oq-Ie; Mon, 01 Jul 2019 21:55:50 +0000 From: Christoph Hellwig To: Andreas Gruenbacher Cc: "Darrick J . Wong" , linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, cluster-devel@redhat.com Subject: [PATCH 08/15] gfs2: remove the unused gfs2_stuffed_write_end function Date: Mon, 1 Jul 2019 23:54:32 +0200 Message-Id: <20190701215439.19162-9-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190701215439.19162-1-hch@lst.de> References: <20190701215439.19162-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Signed-off-by: Christoph Hellwig --- fs/gfs2/aops.c | 41 ----------------------------------------- fs/gfs2/aops.h | 3 --- 2 files changed, 44 deletions(-) diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c index abeac61cfed3..3c58b40c93eb 100644 --- a/fs/gfs2/aops.c +++ b/fs/gfs2/aops.c @@ -685,47 +685,6 @@ void adjust_fs_space(struct inode *inode) gfs2_trans_end(sdp); } -/** - * gfs2_stuffed_write_end - Write end for stuffed files - * @inode: The inode - * @dibh: The buffer_head containing the on-disk inode - * @pos: The file position - * @copied: How much was actually copied by the VFS - * @page: The page - * - * This copies the data from the page into the inode block after - * the inode data structure itself. - * - * Returns: copied bytes or errno - */ -int gfs2_stuffed_write_end(struct inode *inode, struct buffer_head *dibh, - loff_t pos, unsigned copied, - struct page *page) -{ - struct gfs2_inode *ip = GFS2_I(inode); - u64 to = pos + copied; - void *kaddr; - unsigned char *buf = dibh->b_data + sizeof(struct gfs2_dinode); - - BUG_ON(pos + copied > gfs2_max_stuffed_size(ip)); - - kaddr = kmap_atomic(page); - memcpy(buf + pos, kaddr + pos, copied); - flush_dcache_page(page); - kunmap_atomic(kaddr); - - WARN_ON(!PageUptodate(page)); - unlock_page(page); - put_page(page); - - if (copied) { - if (inode->i_size < to) - i_size_write(inode, to); - mark_inode_dirty(inode); - } - return copied; -} - /** * jdata_set_page_dirty - Page dirtying function * @page: The page to dirty diff --git a/fs/gfs2/aops.h b/fs/gfs2/aops.h index fa8e5d0144dd..3a6d8a90d99e 100644 --- a/fs/gfs2/aops.h +++ b/fs/gfs2/aops.h @@ -9,9 +9,6 @@ #include "incore.h" extern int stuffed_readpage(struct gfs2_inode *ip, struct page *page); -extern int gfs2_stuffed_write_end(struct inode *inode, struct buffer_head *dibh, - loff_t pos, unsigned copied, - struct page *page); extern void adjust_fs_space(struct inode *inode); extern void gfs2_page_add_databufs(struct gfs2_inode *ip, struct page *page, unsigned int from, unsigned int len); -- 2.20.1