From: Dongsheng Yang <yangds.fnst@cn.fujitsu.com> To: <viro@ZenIV.linux.org.uk>, <jack@suse.cz>, <dedekind1@gmail.com>, <richard.weinberger@gmail.com> Cc: linux-fsdevel@vger.kernel.org, Dongsheng Yang <yangds.fnst@cn.fujitsu.com>, linux-mtd@lists.infradead.org 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 [thread overview] Message-ID: <1442307754-13233-36-git-send-email-yangds.fnst@cn.fujitsu.com> (raw) In-Reply-To: <1442307754-13233-1-git-send-email-yangds.fnst@cn.fujitsu.com> 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 <yangds.fnst@cn.fujitsu.com> --- 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) -- 1.8.4.2 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
WARNING: multiple messages have this Message-ID (diff)
From: Dongsheng Yang <yangds.fnst@cn.fujitsu.com> To: <viro@ZenIV.linux.org.uk>, <jack@suse.cz>, <dedekind1@gmail.com>, <richard.weinberger@gmail.com> Cc: <linux-mtd@lists.infradead.org>, <linux-fsdevel@vger.kernel.org>, Dongsheng Yang <yangds.fnst@cn.fujitsu.com> 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 [thread overview] Message-ID: <1442307754-13233-36-git-send-email-yangds.fnst@cn.fujitsu.com> (raw) In-Reply-To: <1442307754-13233-1-git-send-email-yangds.fnst@cn.fujitsu.com> 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 <yangds.fnst@cn.fujitsu.com> --- 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) -- 1.8.4.2
next prev parent reply other threads:[~2015-09-15 9:02 UTC|newest] Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-09-15 9:01 [PATCH v3 00/39] Add quota supporting in ubifs Dongsheng Yang 2015-09-15 9:01 ` Dongsheng Yang 2015-09-15 9:01 ` [PATCH v3 01/39] fs: introduce a ->s_cdev field into struct super_block Dongsheng Yang 2015-09-15 9:01 ` Dongsheng Yang 2015-10-04 6:31 ` Christoph Hellwig 2015-10-05 8:36 ` Jan Kara 2015-09-15 9:01 ` [PATCH v3 02/39] fs: cleanup: remove the blank line before EXPORT_SYMBOL Dongsheng Yang 2015-09-15 9:01 ` Dongsheng Yang 2015-09-15 9:01 ` [PATCH v3 03/39] fs: super: cleanup: make the comment of each function aligned Dongsheng Yang 2015-09-15 9:01 ` Dongsheng Yang 2015-09-15 9:01 ` [PATCH v3 04/39] fs: super: consolidate the get_super class functions Dongsheng Yang 2015-09-15 9:01 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 05/39] fs: super: introduce a get_super_cdev to get super by a cdev reference Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-10-04 6:32 ` Christoph Hellwig 2015-09-15 9:02 ` [PATCH v3 06/39] fs: super: introduce a get_super_cdev_thawed to get sb by " Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-15 21:24 ` Jan Kara 2015-09-15 9:02 ` [PATCH v3 07/39] fs: char_dev: introduce cd_acquire function to acquire cdev Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-16 8:16 ` Jan Kara 2015-09-17 3:30 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 08/39] fs: introduce a __lookup_dev for internal using Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 09/39] fs: char_dev: introduce lookup_cdev to get cdev by pathname Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 10/39] fs: dquot: skip invalidate_bdev if bdev is NULL Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 11/39] fs: quota: replace opened calling of ->sync_fs with sync_filesystem Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-16 10:14 ` Jan Kara 2015-09-17 6:28 ` Dongsheng Yang 2015-09-17 6:28 ` Dongsheng Yang 2015-09-17 11:05 ` Jan Kara 2015-09-18 5:49 ` Dongsheng Yang 2015-09-18 9:00 ` Jan Kara 2015-09-21 4:31 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 12/39] fs: quota: make quota support fs which is running on char dev Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 13/39] fs: introduce a get_qsize() to inode_operations Dongsheng Yang 2015-10-04 6:33 ` Christoph Hellwig 2015-10-05 8:01 ` Jan Kara 2015-09-15 9:02 ` [PATCH v3 14/39] fs: quota: restore i_flags of quota files in dquot_disable Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 15/39] fs: quota: introduce a callback of restore_iflags to quotactl_ops Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-16 9:47 ` Jan Kara 2015-09-15 9:02 ` [PATCH v3 16/39] ubi: introduce a interface to get cdev in ubi_volume Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 17/39] ubifs: extend budget for blocks Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 18/39] ubifs: fill sb->s_cdev in ubifs_fill_super() Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 19/39] ubifs: fill ->s_dev in ubifs_fill_super Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 20/39] ubifs: export read_block() from file.c Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 21/39] ubifs: introduce i_dquot to ubifs_inode Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 22/39] ubifs: implement IO functions for quota files Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 23/39] ubifs: disable quota in ubifs_put_super Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 24/39] ubifs: write quota back in ubifs_sync Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 25/39] ubifs: set/clear MS_RDONLY properly in ubifs_remount Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 26/39] ubifs: suspend & resume quota " Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 27/39] ubifs: check inode with NULL before using it Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 28/39] ubifs: record quota information about inode in ubifs_new_inode Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-15 9:35 ` Sheng Yong 2015-09-16 1:46 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 29/39] ubifs: free quota inode information in ubifs_evict_inode Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 30/39] ubifs: alloc quota space in ubifs writing path Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 31/39] ubifs: free quota space in do_truncation Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 32/39] ubifs: free quota space when deleting a file Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 33/39] ubifs: adapt quota space informatin in do_setattr Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 34/39] ubifs: transfer quota information in changing owner or group Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang [this message] 2015-09-15 9:02 ` [PATCH v3 35/39] ubifs: write inode in ubifs_quota_write if we are appending Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 36/39] ubifs: implement ubifs_get_qsize to get quota size in ubifs Dongsheng Yang 2015-09-16 10:00 ` Jan Kara 2015-09-17 7:23 ` Dongsheng Yang 2015-09-17 7:23 ` Dongsheng Yang 2015-09-17 12:00 ` Jan Kara 2015-09-18 6:14 ` Dongsheng Yang 2015-09-18 11:20 ` Jan Kara 2015-09-21 4:35 ` Dongsheng Yang 2015-09-21 9:13 ` Jan Kara 2015-09-21 9:16 ` Dongsheng Yang 2015-09-21 9:44 ` Jan Kara 2015-09-21 11:02 ` Dongsheng Yang 2015-09-23 7:42 ` Jan Kara 2015-09-24 0:50 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 37/39] ubifs: implement ubifs_restore_iflags for quotactl_operations Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 38/39] ubifs: fill the quota related fields in ubifs_fill_super Dongsheng Yang 2015-09-15 9:02 ` [PATCH v3 39/39] ubifs: introduce quota related mount options Dongsheng Yang 2015-09-15 9:02 ` Dongsheng Yang 2015-09-15 9:36 ` Sheng Yong 2015-09-16 1:48 ` Dongsheng Yang 2015-10-03 18:57 ` [PATCH v3 00/39] Add quota supporting in ubifs Richard Weinberger 2015-10-04 2:32 ` Dongsheng Yang
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1442307754-13233-36-git-send-email-yangds.fnst@cn.fujitsu.com \ --to=yangds.fnst@cn.fujitsu.com \ --cc=dedekind1@gmail.com \ --cc=jack@suse.cz \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-mtd@lists.infradead.org \ --cc=richard.weinberger@gmail.com \ --cc=viro@ZenIV.linux.org.uk \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.