| Message ID | 20170612152013.4045-1-jack@suse.cz |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Mon, Jun 12, 2017 at 05:20:13PM +0200, Jan Kara wrote: > These days inode reclaim calls evict_inode() only when it has no pages > in the mapping. In that case it is not necessary to wait for transaction > commit in ext4_evict_inode() as there can be no pages waiting to be > committed. So avoid unnecessary transaction waiting in that case. > > We still have to keep the check for the case where ext4_evict_inode() > gets called from other paths (e.g. umount) where inode still can have > some page cache pages. > > Reported-by: Johannes Weiner <hannes@cmpxchg.org> > Signed-off-by: Jan Kara <jack@suse.cz> Thanks, applied. - Ted
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 5834c4d76be8..3aef67ca18ac 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -213,7 +213,8 @@ void ext4_evict_inode(struct inode *inode) */ if (inode->i_ino != EXT4_JOURNAL_INO && ext4_should_journal_data(inode) && - (S_ISLNK(inode->i_mode) || S_ISREG(inode->i_mode))) { + (S_ISLNK(inode->i_mode) || S_ISREG(inode->i_mode)) && + inode->i_data.nrpages) { journal_t *journal = EXT4_SB(inode->i_sb)->s_journal; tid_t commit_tid = EXT4_I(inode)->i_datasync_tid;
These days inode reclaim calls evict_inode() only when it has no pages in the mapping. In that case it is not necessary to wait for transaction commit in ext4_evict_inode() as there can be no pages waiting to be committed. So avoid unnecessary transaction waiting in that case. We still have to keep the check for the case where ext4_evict_inode() gets called from other paths (e.g. umount) where inode still can have some page cache pages. Reported-by: Johannes Weiner <hannes@cmpxchg.org> Signed-off-by: Jan Kara <jack@suse.cz> --- fs/ext4/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)