lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <20171216134656.15561-19-jlayton@kernel.org> Date: Sat, 16 Dec 2017 08:46:55 -0500 From: Jeff Layton <jlayton@...nel.org> To: linux-fsdevel@...r.kernel.org Cc: linux-kernel@...r.kernel.org, viro@...iv.linux.org.uk, linux-nfs@...r.kernel.org, bfields@...ldses.org, neilb@...e.de, jack@...e.de, linux-ext4@...r.kernel.org, tytso@....edu, adilger.kernel@...ger.ca, linux-xfs@...r.kernel.org, darrick.wong@...cle.com, david@...morbit.com, linux-btrfs@...r.kernel.org, clm@...com, jbacik@...com, dsterba@...e.com, linux-integrity@...r.kernel.org, zohar@...ux.vnet.ibm.com, dmitry.kasatkin@...il.com, linux-afs@...ts.infradead.org, dhowells@...hat.com Subject: [PATCH v2 18/19] btrfs: only dirty the inode in btrfs_update_time if something was changed From: Jeff Layton <jlayton@...hat.com> At this point, we know that "now" and the file times may differ, and we suspect that the i_version has been flagged to be bumped. Attempt to bump the i_version, and only mark the inode dirty if that actually occurred or if one of the times was updated. Signed-off-by: Jeff Layton <jlayton@...hat.com> --- fs/btrfs/inode.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 1dfa299a31a9..5d1956ad6d39 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -6106,19 +6106,20 @@ static int btrfs_update_time(struct inode *inode, struct timespec *now, int flags) { struct btrfs_root *root = BTRFS_I(inode)->root; + bool dirty = flags & ~S_VERSION; if (btrfs_root_readonly(root)) return -EROFS; if (flags & S_VERSION) - inode_inc_iversion(inode); + dirty |= inode_maybe_inc_iversion(inode, dirty); if (flags & S_CTIME) inode->i_ctime = *now; if (flags & S_MTIME) inode->i_mtime = *now; if (flags & S_ATIME) inode->i_atime = *now; - return btrfs_dirty_inode(inode); + return dirty ? btrfs_dirty_inode(inode) : 0; } /* -- 2.14.3
Powered by blists - more mailing lists