From: Jan Kara <jack@suse.cz> To: LKML <linux-kernel@vger.kernel.org> Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Jan Kara <jack@suse.cz> Subject: [PATCH 6/6] ext3: Convert ext3 to use mapping lock Date: Thu, 31 Jan 2013 22:49:54 +0100 [thread overview] Message-ID: <1359668994-13433-7-git-send-email-jack@suse.cz> (raw) In-Reply-To: <1359668994-13433-1-git-send-email-jack@suse.cz> Convert the filesystem to use mapping lock when truncating files and doing buffered writes. The rest is handled in the generic code. Signed-off-by: Jan Kara <jack@suse.cz> --- fs/ext3/inode.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index b176d42..1f5d5f1 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c @@ -1261,6 +1261,7 @@ static int ext3_write_begin(struct file *file, struct address_space *mapping, index = pos >> PAGE_CACHE_SHIFT; from = pos & (PAGE_CACHE_SIZE - 1); to = from + len; + flags |= AOP_FLAG_LOCK_MAPPING; retry: page = grab_cache_page_write_begin(mapping, index, flags); @@ -3273,6 +3274,8 @@ int ext3_setattr(struct dentry *dentry, struct iattr *attr) struct inode *inode = dentry->d_inode; int error, rc = 0; const unsigned int ia_valid = attr->ia_valid; + struct range_lock mapping_lock; + int range_locked = 0; error = inode_change_ok(inode, attr); if (error) @@ -3314,6 +3317,12 @@ int ext3_setattr(struct dentry *dentry, struct iattr *attr) attr->ia_valid & ATTR_SIZE && attr->ia_size < inode->i_size) { handle_t *handle; + range_lock_init(&mapping_lock, + attr->ia_size >> PAGE_CACHE_SHIFT, + ULONG_MAX); + range_lock(&inode->i_mapping->mapping_lock, &mapping_lock); + range_locked = 1; + handle = ext3_journal_start(inode, 3); if (IS_ERR(handle)) { error = PTR_ERR(handle); @@ -3351,6 +3360,12 @@ int ext3_setattr(struct dentry *dentry, struct iattr *attr) attr->ia_size != i_size_read(inode)) { truncate_setsize(inode, attr->ia_size); ext3_truncate(inode); + + if (range_locked) { + range_unlock(&inode->i_mapping->mapping_lock, + &mapping_lock); + range_locked = 0; + } } setattr_copy(inode, attr); @@ -3360,6 +3375,8 @@ int ext3_setattr(struct dentry *dentry, struct iattr *attr) rc = ext3_acl_chmod(inode); err_out: + if (range_locked) + range_unlock(&inode->i_mapping->mapping_lock, &mapping_lock); ext3_std_error(inode->i_sb, error); if (!error) error = rc; -- 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: Jan Kara <jack@suse.cz> To: LKML <linux-kernel@vger.kernel.org> Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Jan Kara <jack@suse.cz> Subject: [PATCH 6/6] ext3: Convert ext3 to use mapping lock Date: Thu, 31 Jan 2013 22:49:54 +0100 [thread overview] Message-ID: <1359668994-13433-7-git-send-email-jack@suse.cz> (raw) In-Reply-To: <1359668994-13433-1-git-send-email-jack@suse.cz> Convert the filesystem to use mapping lock when truncating files and doing buffered writes. The rest is handled in the generic code. Signed-off-by: Jan Kara <jack@suse.cz> --- fs/ext3/inode.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index b176d42..1f5d5f1 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c @@ -1261,6 +1261,7 @@ static int ext3_write_begin(struct file *file, struct address_space *mapping, index = pos >> PAGE_CACHE_SHIFT; from = pos & (PAGE_CACHE_SIZE - 1); to = from + len; + flags |= AOP_FLAG_LOCK_MAPPING; retry: page = grab_cache_page_write_begin(mapping, index, flags); @@ -3273,6 +3274,8 @@ int ext3_setattr(struct dentry *dentry, struct iattr *attr) struct inode *inode = dentry->d_inode; int error, rc = 0; const unsigned int ia_valid = attr->ia_valid; + struct range_lock mapping_lock; + int range_locked = 0; error = inode_change_ok(inode, attr); if (error) @@ -3314,6 +3317,12 @@ int ext3_setattr(struct dentry *dentry, struct iattr *attr) attr->ia_valid & ATTR_SIZE && attr->ia_size < inode->i_size) { handle_t *handle; + range_lock_init(&mapping_lock, + attr->ia_size >> PAGE_CACHE_SHIFT, + ULONG_MAX); + range_lock(&inode->i_mapping->mapping_lock, &mapping_lock); + range_locked = 1; + handle = ext3_journal_start(inode, 3); if (IS_ERR(handle)) { error = PTR_ERR(handle); @@ -3351,6 +3360,12 @@ int ext3_setattr(struct dentry *dentry, struct iattr *attr) attr->ia_size != i_size_read(inode)) { truncate_setsize(inode, attr->ia_size); ext3_truncate(inode); + + if (range_locked) { + range_unlock(&inode->i_mapping->mapping_lock, + &mapping_lock); + range_locked = 0; + } } setattr_copy(inode, attr); @@ -3360,6 +3375,8 @@ int ext3_setattr(struct dentry *dentry, struct iattr *attr) rc = ext3_acl_chmod(inode); err_out: + if (range_locked) + range_unlock(&inode->i_mapping->mapping_lock, &mapping_lock); ext3_std_error(inode->i_sb, error); if (!error) error = rc; -- 1.7.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2013-01-31 21:51 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-01-31 21:49 [PATCH 0/6 RFC] Mapping range lock Jan Kara 2013-01-31 21:49 ` Jan Kara 2013-01-31 21:49 ` [PATCH 1/6] lib: Implement range locks Jan Kara 2013-01-31 21:49 ` Jan Kara 2013-01-31 23:57 ` Andrew Morton 2013-01-31 23:57 ` Andrew Morton 2013-02-04 16:41 ` Jan Kara 2013-02-04 16:41 ` Jan Kara 2013-02-11 5:42 ` Michel Lespinasse 2013-02-11 5:42 ` Michel Lespinasse 2013-02-11 10:27 ` Jan Kara 2013-02-11 10:27 ` Jan Kara 2013-02-11 11:03 ` Michel Lespinasse 2013-02-11 11:03 ` Michel Lespinasse 2013-02-11 12:58 ` Jan Kara 2013-02-11 12:58 ` Jan Kara 2013-01-31 21:49 ` [PATCH 2/6] fs: Take mapping lock in generic read paths Jan Kara 2013-01-31 21:49 ` Jan Kara 2013-01-31 23:59 ` Andrew Morton 2013-01-31 23:59 ` Andrew Morton 2013-02-04 12:47 ` Jan Kara 2013-02-04 12:47 ` Jan Kara 2013-02-08 14:59 ` Jan Kara 2013-02-08 14:59 ` Jan Kara 2013-01-31 21:49 ` [PATCH 3/6] fs: Provide function to take mapping lock in buffered write path Jan Kara 2013-01-31 21:49 ` Jan Kara 2013-01-31 21:49 ` [PATCH 4/6] fs: Don't call dio_cleanup() before submitting all bios Jan Kara 2013-01-31 21:49 ` Jan Kara 2013-01-31 21:49 ` [PATCH 5/6] fs: Take mapping lock during direct IO Jan Kara 2013-01-31 21:49 ` Jan Kara 2013-01-31 21:49 ` Jan Kara [this message] 2013-01-31 21:49 ` [PATCH 6/6] ext3: Convert ext3 to use mapping lock Jan Kara 2013-02-01 0:07 ` [PATCH 0/6 RFC] Mapping range lock Andrew Morton 2013-02-01 0:07 ` Andrew Morton 2013-02-04 9:29 ` Zheng Liu 2013-02-04 9:29 ` Zheng Liu 2013-02-04 12:38 ` Jan Kara 2013-02-04 12:38 ` Jan Kara 2013-02-05 23:25 ` Dave Chinner 2013-02-05 23:25 ` Dave Chinner 2013-02-06 19:25 ` Jan Kara 2013-02-06 19:25 ` Jan Kara 2013-02-07 2:43 ` Dave Chinner 2013-02-07 2:43 ` Dave Chinner 2013-02-07 11:06 ` Jan Kara 2013-02-07 11:06 ` Jan Kara
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=1359668994-13433-7-git-send-email-jack@suse.cz \ --to=jack@suse.cz \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ /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.