Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752886AbdLMOUt (ORCPT ); Wed, 13 Dec 2017 09:20:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:36170 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753334AbdLMOUl (ORCPT ); Wed, 13 Dec 2017 09:20:41 -0500 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 23829219AD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=jlayton@kernel.org From: Jeff Layton To: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, hch@lst.de, neilb@suse.de, bfields@fieldses.org, amir73il@gmail.com, jack@suse.de, viro@zeniv.linux.org.uk Subject: [PATCH 16/19] fs: only set S_VERSION when updating times if necessary Date: Wed, 13 Dec 2017 09:20:14 -0500 Message-Id: <20171213142017.23653-17-jlayton@kernel.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171213142017.23653-1-jlayton@kernel.org> References: <20171213142017.23653-1-jlayton@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1664 Lines: 52 From: Jeff Layton We only really need to update i_version if someone has queried for it since we last incremented it. By doing that, we can avoid having to update the inode if the times haven't changed. If the times have changed, then we go ahead and forcibly increment the counter, under the assumption that we'll be going to the storage anyway, and the increment itself is relatively cheap. Signed-off-by: Jeff Layton --- fs/inode.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fs/inode.c b/fs/inode.c index 03102d6ef044..7f4215f4309c 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -1634,17 +1634,18 @@ static int relatime_need_update(const struct path *path, struct inode *inode, int generic_update_time(struct inode *inode, struct timespec *time, int flags) { int iflags = I_DIRTY_TIME; + bool dirty = flags & ~S_VERSION; if (flags & S_ATIME) inode->i_atime = *time; - if (flags & S_VERSION) - inode_inc_iversion(inode); if (flags & S_CTIME) inode->i_ctime = *time; if (flags & S_MTIME) inode->i_mtime = *time; + if (flags & S_VERSION) + dirty |= inode_maybe_inc_iversion(inode, dirty); - if (!(inode->i_sb->s_flags & SB_LAZYTIME) || (flags & S_VERSION)) + if (dirty || !(inode->i_sb->s_flags & SB_LAZYTIME)) iflags |= I_DIRTY_SYNC; __mark_inode_dirty(inode, iflags); return 0; @@ -1863,7 +1864,7 @@ int file_update_time(struct file *file) if (!timespec_equal(&inode->i_ctime, &now)) sync_it |= S_CTIME; - if (IS_I_VERSION(inode)) + if (IS_I_VERSION(inode) && inode_iversion_need_inc(inode)) sync_it |= S_VERSION; if (!sync_it) -- 2.14.3