From: Christoph Hellwig <hch@infradead.org>
To: viro@zeniv.linux.org.uk, tglx@linutronix.de
Cc: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org,
linux-btrfs@vger.kernel.org, hirofumi@mail.parknet.co.jp,
mfasheh@suse.com, jlbec@evilplan.org
Subject: [PATCH 2/8] ext4: remove i_alloc_sem abuse
Date: Mon, 20 Jun 2011 16:15:35 -0400 [thread overview]
Message-ID: <20110620202030.765939598@bombadil.infradead.org> (raw)
In-Reply-To: 20110620201533.847236272@bombadil.infradead.org
[-- Attachment #1: ext4-introduce-truncate-mutex --]
[-- Type: text/plain, Size: 3431 bytes --]
Add a new rw_semaphore to protect page_mkwrite against truncate. Previous
i_alloc_sem was abused for this, but it's going away in this series.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Index: linux-2.6/fs/ext4/inode.c
===================================================================
--- linux-2.6.orig/fs/ext4/inode.c 2011-06-20 14:25:33.779248128 +0200
+++ linux-2.6/fs/ext4/inode.c 2011-06-20 14:27:53.025907745 +0200
@@ -5357,6 +5357,7 @@ int ext4_setattr(struct dentry *dentry,
if (attr->ia_size > sbi->s_bitmap_maxbytes)
return -EFBIG;
}
+ down_write(&(EXT4_I(inode)->truncate_lock));
}
if (S_ISREG(inode->i_mode) &&
@@ -5405,6 +5406,9 @@ int ext4_setattr(struct dentry *dentry,
ext4_truncate(inode);
}
+ if (attr->ia_valid & ATTR_SIZE)
+ up_write(&(EXT4_I(inode)->truncate_lock));
+
if (!rc) {
setattr_copy(inode, attr);
mark_inode_dirty(inode);
@@ -5850,10 +5854,10 @@ int ext4_page_mkwrite(struct vm_area_str
struct address_space *mapping = inode->i_mapping;
/*
- * Get i_alloc_sem to stop truncates messing with the inode. We cannot
- * get i_mutex because we are already holding mmap_sem.
+ * Get truncate_lock to stop truncates messing with the inode. We
+ * cannot get i_mutex because we are already holding mmap_sem.
*/
- down_read(&inode->i_alloc_sem);
+ down_read(&(EXT4_I(inode)->truncate_lock));
size = i_size_read(inode);
if (page->mapping != mapping || size <= page_offset(page)
|| !PageUptodate(page)) {
@@ -5865,7 +5869,7 @@ int ext4_page_mkwrite(struct vm_area_str
lock_page(page);
wait_on_page_writeback(page);
if (PageMappedToDisk(page)) {
- up_read(&inode->i_alloc_sem);
+ up_read(&(EXT4_I(inode)->truncate_lock));
return VM_FAULT_LOCKED;
}
@@ -5883,7 +5887,7 @@ int ext4_page_mkwrite(struct vm_area_str
if (page_has_buffers(page)) {
if (!walk_page_buffers(NULL, page_buffers(page), 0, len, NULL,
ext4_bh_unmapped)) {
- up_read(&inode->i_alloc_sem);
+ up_read(&(EXT4_I(inode)->truncate_lock));
return VM_FAULT_LOCKED;
}
}
@@ -5912,11 +5916,11 @@ int ext4_page_mkwrite(struct vm_area_str
*/
lock_page(page);
wait_on_page_writeback(page);
- up_read(&inode->i_alloc_sem);
+ up_read(&(EXT4_I(inode)->truncate_lock));
return VM_FAULT_LOCKED;
out_unlock:
if (ret)
ret = VM_FAULT_SIGBUS;
- up_read(&inode->i_alloc_sem);
+ up_read(&(EXT4_I(inode)->truncate_lock));
return ret;
}
Index: linux-2.6/fs/ext4/super.c
===================================================================
--- linux-2.6.orig/fs/ext4/super.c 2011-06-20 14:25:33.795914793 +0200
+++ linux-2.6/fs/ext4/super.c 2011-06-20 14:27:06.269243443 +0200
@@ -871,6 +871,7 @@ static struct inode *ext4_alloc_inode(st
ei->i_datasync_tid = 0;
atomic_set(&ei->i_ioend_count, 0);
atomic_set(&ei->i_aiodio_unwritten, 0);
+ init_rwsem(&ei->truncate_lock);
return &ei->vfs_inode;
}
Index: linux-2.6/fs/ext4/ext4.h
===================================================================
--- linux-2.6.orig/fs/ext4/ext4.h 2011-06-20 14:25:33.752581461 +0200
+++ linux-2.6/fs/ext4/ext4.h 2011-06-20 14:27:06.272576777 +0200
@@ -844,6 +844,9 @@ struct ext4_inode_info {
/* on-disk additional length */
__u16 i_extra_isize;
+ /* protect page_mkwrite against truncates */
+ struct rw_semaphore truncate_lock;
+
#ifdef CONFIG_QUOTA
/* quota space reservation, managed internally by quota code */
qsize_t i_reserved_quota;
next prev parent reply other threads:[~2011-06-20 20:20 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-20 20:15 [PATCH 0/8] remove i_alloc_sem Christoph Hellwig
2011-06-20 20:15 ` [PATCH 1/8] far: remove i_alloc_sem abuse Christoph Hellwig
2011-06-21 15:57 ` OGAWA Hirofumi
2011-06-21 16:09 ` OGAWA Hirofumi
2011-06-21 16:09 ` Christoph Hellwig
2011-06-20 20:15 ` Christoph Hellwig [this message]
2011-06-21 16:34 ` [PATCH 2/8] ext4: " Lukas Czerner
2011-06-21 16:48 ` Lukas Czerner
2011-06-21 17:16 ` Christoph Hellwig
2011-06-20 20:15 ` [PATCH 3/8] fs: simpler handling of zero sized reads in __blockdev_direct_IO Christoph Hellwig
2011-06-20 20:15 ` [PATCH 4/8] fs: kill i_alloc_sem Christoph Hellwig
2011-06-20 21:32 ` Joel Becker
2011-06-20 22:18 ` Christoph Hellwig
2011-07-01 2:58 ` Joel Becker
2011-06-21 5:40 ` Dave Chinner
2011-06-21 9:35 ` Christoph Hellwig
2011-06-20 20:15 ` [PATCH 5/8] fs: move inode_dio_wait calls into ->setattr Christoph Hellwig
2011-06-20 20:15 ` [PATCH 6/8] fs: always maintain i_dio_count Christoph Hellwig
2011-06-20 21:29 ` Joel Becker
2011-06-20 22:23 ` Christoph Hellwig
2011-06-20 20:15 ` [PATCH 7/8] btrfs: wait for direct I/O requests in truncate Christoph Hellwig
2011-06-20 20:15 ` [PATCH 8/8] rw_semaphore: remove up/down_read_non_owner Christoph Hellwig
2011-06-20 20:32 ` [PATCH 0/8] remove i_alloc_sem Christoph Hellwig
2011-06-21 23:54 ` Jan Kara
2011-06-22 9:39 ` Christoph Hellwig
2011-06-22 14:22 ` Ted Ts'o
2011-06-22 18:13 ` Jan Kara
2011-06-23 10:36 ` Christoph Hellwig
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=20110620202030.765939598@bombadil.infradead.org \
--to=hch@infradead.org \
--cc=hirofumi@mail.parknet.co.jp \
--cc=jlbec@evilplan.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=mfasheh@suse.com \
--cc=tglx@linutronix.de \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).