From patchwork Tue Sep 15 09:02:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Dongsheng X-Patchwork-Id: 7182511 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EE29E9F6DA for ; Tue, 15 Sep 2015 09:34:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 225A320647 for ; Tue, 15 Sep 2015 09:34:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 42BE020608 for ; Tue, 15 Sep 2015 09:34:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754714AbbIOJeZ (ORCPT ); Tue, 15 Sep 2015 05:34:25 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:53515 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1754311AbbIOJJe (ORCPT ); Tue, 15 Sep 2015 05:09:34 -0400 X-IronPort-AV: E=Sophos;i="5.15,520,1432569600"; d="scan'208";a="100730405" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 15 Sep 2015 17:12:25 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t8F99Igo008111; Tue, 15 Sep 2015 17:09:18 +0800 Received: from yds-PC.g08.fujitsu.local (10.167.226.66) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Tue, 15 Sep 2015 17:09:32 +0800 From: Dongsheng Yang To: , , , CC: , , Dongsheng Yang Subject: [PATCH v3 35/39] ubifs: write inode in ubifs_quota_write if we are appending Date: Tue, 15 Sep 2015 17:02:30 +0800 Message-ID: <1442307754-13233-36-git-send-email-yangds.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1442307754-13233-1-git-send-email-yangds.fnst@cn.fujitsu.com> References: <1442307754-13233-1-git-send-email-yangds.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.66] Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When we are appending writing quota file, we have to do a budgeting for the inode and write inode in ubifs_quota_write. Signed-off-by: Dongsheng Yang --- fs/ubifs/super.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 47b1f44..d3213a2 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -980,6 +980,10 @@ static ssize_t ubifs_quota_write(struct super_block *sb, int type, const char *data, size_t len, loff_t off) { struct inode *inode = sb_dqopt(sb)->files[type]; + struct ubifs_inode *ui = ubifs_inode(inode); + loff_t end_pos = off + len; + int appending = (end_pos > inode->i_size); + int ino_released = 0; unsigned long block = off >> UBIFS_BLOCK_SHIFT; struct ubifs_info *c = inode->i_sb->s_fs_info; int offset = off & (sb->s_blocksize - 1); @@ -988,6 +992,8 @@ static ssize_t ubifs_quota_write(struct super_block *sb, int type, size_t towrite = len; int ret, err = 0; struct ubifs_budget_req req = {}; + struct ubifs_budget_req ino_req = { .dirtied_ino = 1, + .dirtied_ino_d = ALIGN(ui->data_len, 8) }; struct ubifs_data_node *dn; char *block_buf; @@ -1014,6 +1020,12 @@ static ssize_t ubifs_quota_write(struct super_block *sb, int type, if (err) goto out; + if (appending) { + err = ubifs_budget_space(c, &ino_req); + if (err) + goto release_block; + } + dn = kmalloc(UBIFS_MAX_DATA_NODE_SZ, GFP_NOFS); if (!dn) { err = -ENOMEM; @@ -1050,11 +1062,23 @@ static ssize_t ubifs_quota_write(struct super_block *sb, int type, towrite -= tocopy; data += tocopy; } + if (appending) { + mutex_lock(&ui->ui_mutex); + i_size_write(inode, end_pos); + ui->ui_size = end_pos; + __mark_inode_dirty(inode, I_DIRTY_DATASYNC); + mutex_unlock(&ui->ui_mutex); + err = inode->i_sb->s_op->write_inode(inode, NULL); + ino_released = 1; + } free_buf: kfree(block_buf); free_dn: kfree(dn); release_budget: + if (appending && !ino_released) + ubifs_release_budget(c, &ino_req); +release_block: ubifs_release_budget(c, &req); out: if (!err)