From patchwork Wed Apr 4 02:37:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Sorenson X-Patchwork-Id: 10321973 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 15D1460467 for ; Wed, 4 Apr 2018 02:37:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 05AD028DEE for ; Wed, 4 Apr 2018 02:37:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EE72728DF2; Wed, 4 Apr 2018 02:37:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F06B28DEE for ; Wed, 4 Apr 2018 02:37:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754286AbeDDChX (ORCPT ); Tue, 3 Apr 2018 22:37:23 -0400 Received: from mail-io0-f193.google.com ([209.85.223.193]:44046 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753080AbeDDChW (ORCPT ); Tue, 3 Apr 2018 22:37:22 -0400 Received: by mail-io0-f193.google.com with SMTP id d7so24418362ioc.11 for ; Tue, 03 Apr 2018 19:37:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=J7R6Xfn8L8+DEPinHgoeayW2/NISfnirpFalB9VTpl0=; b=HeQUAqy4CNziwsZ+nUnRNCbmcHk2YDmUPFuxYONVYjx1URFHum+po1ER+KhyII3fQM ADTed5HGGrcRSR/CEs8ObQR8MIq4PH6z5doBg5EfoqzMUuODuLmurCZ75kO7EyLdD2Ww 1H5fvSbSRcMjzQQi/k8ZsTVz7wE8naIijTlv8y99zLEpCzfe/aCjx4aNuVofqvfRIt5R WT/eulHIvvfma6zZoytIZg9c7fsiv5lbTcUlyc5zxFCGXm6YPz7C6gOJ43bQCs8sP6e6 hr+YXlICAgaA/mqoKUgxNrMW9X/yYLsdI30RpI9phROLjQ5iIDES27rQ3zE1v/xwOwBZ rw/w== X-Gm-Message-State: ALQs6tDOQP6Q2NMAZU41ykExxFABWOQ7TJYbTX6sqSpJVf1S9moj4qDa uaze7SoZnhIT8tnYw4fuRw9n58veO1A= X-Google-Smtp-Source: AIpwx4+pLXE1zCzEh6W5Nr8XhQz7u+MjRyjFrPwPwBO3E6HiCvk78Fr4/lmz60kFJUHm9qZmy28hTg== X-Received: by 10.107.180.68 with SMTP id d65mr641182iof.244.1522809441610; Tue, 03 Apr 2018 19:37:21 -0700 (PDT) Received: from hut.sorensonfamily.com (198-0-247-150-static.hfc.comcastbusiness.net. [198.0.247.150]) by smtp.gmail.com with ESMTPSA id e91-v6sm1232176itd.27.2018.04.03.19.37.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Apr 2018 19:37:20 -0700 (PDT) To: OGAWA Hirofumi , linux-fsdevel@vger.kernel.org From: Frank Sorenson Subject: [PATCH V2 2/2] fat: change timestamp updates to use fat_update_time Message-ID: Date: Tue, 3 Apr 2018 21:37:20 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 Content-Language: en-US Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Author: Frank Sorenson Date: 2018-04-03 20:21:58 -0500 fat: change timestamp updates to use fat_update_time Make the inode timestamp updates use fat_update_time. Signed-off-by: Frank Sorenson diff --git a/fs/fat/dir.c b/fs/fat/dir.c index 8e100c3bf72c..d33eb82044c8 100644 --- a/fs/fat/dir.c +++ b/fs/fat/dir.c @@ -1071,7 +1071,7 @@ int fat_remove_entries(struct inode *dir, struct fat_slot_info *sinfo) } } - dir->i_mtime = dir->i_atime = current_time(dir); + fat_update_time(dir, NULL, S_ATIME|S_MTIME); if (IS_DIRSYNC(dir)) (void)fat_sync_inode(dir); else diff --git a/fs/fat/file.c b/fs/fat/file.c index 63ec4a5bde77..b5495df1879b 100644 --- a/fs/fat/file.c +++ b/fs/fat/file.c @@ -63,7 +63,8 @@ static int fat_ioctl_set_attributes(struct file *file, u32 __user *user_attr) /* Equivalent to a chmod() */ ia.ia_valid = ATTR_MODE | ATTR_CTIME; - ia.ia_ctime = current_time(inode); + fat_update_time(inode, NULL, S_CTIME); + ia.ia_ctime = inode->i_ctime; if (is_dir) ia.ia_mode = fat_make_mode(sbi, attr, S_IRWXUGO); else { @@ -194,7 +195,7 @@ static int fat_cont_expand(struct inode *inode, loff_t size) if (err) goto out; - inode->i_ctime = inode->i_mtime = current_time(inode); + fat_update_time(inode, NULL, S_MTIME|S_CTIME); mark_inode_dirty(inode); if (IS_SYNC(inode)) { int err2; @@ -297,7 +298,7 @@ static int fat_free(struct inode *inode, int skip) MSDOS_I(inode)->i_logstart = 0; } MSDOS_I(inode)->i_attrs |= ATTR_ARCH; - inode->i_ctime = inode->i_mtime = current_time(inode); + fat_update_time(inode, NULL, S_MTIME|S_CTIME); if (wait) { err = fat_sync_inode(inode); if (err) { @@ -510,6 +511,10 @@ int fat_setattr(struct dentry *dentry, struct iattr *attr) } setattr_copy(inode, attr); + fat_update_time(inode, &inode->i_mtime, S_MTIME); + fat_update_time(inode, &inode->i_ctime, S_CTIME); + fat_update_time(inode, &inode->i_atime, S_ATIME); + mark_inode_dirty(inode); out: return error; diff --git a/fs/fat/inode.c b/fs/fat/inode.c index ffbbf0520d9e..d79d197e5cda 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -238,7 +238,7 @@ static int fat_write_end(struct file *file, struct address_space *mapping, if (err < len) fat_write_failed(mapping, pos + len); if (!(err < 0) && !(MSDOS_I(inode)->i_attrs & ATTR_ARCH)) { - inode->i_mtime = inode->i_ctime = current_time(inode); + fat_update_time(inode, NULL, S_MTIME|S_CTIME); MSDOS_I(inode)->i_attrs |= ATTR_ARCH; mark_inode_dirty(inode); } @@ -558,7 +558,7 @@ int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de) de->cdate, de->ctime_cs); fat_time_fat2unix(sbi, &inode->i_atime, 0, de->adate, 0); } else - inode->i_ctime = inode->i_atime = inode->i_mtime; + fat_update_time(inode, &inode->i_mtime, S_CTIME|S_ATIME); return 0; } diff --git a/fs/fat/namei_msdos.c b/fs/fat/namei_msdos.c index f157df4c1e51..3985c74fe7b2 100644 --- a/fs/fat/namei_msdos.c +++ b/fs/fat/namei_msdos.c @@ -250,7 +250,7 @@ static int msdos_add_entry(struct inode *dir, const unsigned char *name, if (err) return err; - dir->i_ctime = dir->i_mtime = *ts; + fat_update_time(dir, ts, S_MTIME|S_CTIME); if (IS_DIRSYNC(dir)) (void)fat_sync_inode(dir); else @@ -294,7 +294,7 @@ static int msdos_create(struct inode *dir, struct dentry *dentry, umode_t mode, err = PTR_ERR(inode); goto out; } - inode->i_mtime = inode->i_atime = inode->i_ctime = ts; + fat_update_time(inode, &ts, S_MTIME|S_CTIME|S_ATIME); /* timestamp is already written, so mark_inode_dirty() is unneeded. */ d_instantiate(dentry, inode); @@ -331,7 +331,7 @@ static int msdos_rmdir(struct inode *dir, struct dentry *dentry) drop_nlink(dir); clear_nlink(inode); - inode->i_ctime = current_time(inode); + fat_update_time(inode, NULL, S_CTIME); fat_detach(inode); out: mutex_unlock(&MSDOS_SB(sb)->s_lock); @@ -384,7 +384,7 @@ static int msdos_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) goto out; } set_nlink(inode, 2); - inode->i_mtime = inode->i_atime = inode->i_ctime = ts; + fat_update_time(inode, &ts, S_MTIME|S_CTIME|S_ATIME); /* timestamp is already written, so mark_inode_dirty() is unneeded. */ d_instantiate(dentry, inode); @@ -417,7 +417,7 @@ static int msdos_unlink(struct inode *dir, struct dentry *dentry) if (err) goto out; clear_nlink(inode); - inode->i_ctime = current_time(inode); + fat_update_time(inode, NULL, S_CTIME); fat_detach(inode); out: mutex_unlock(&MSDOS_SB(sb)->s_lock); @@ -482,7 +482,7 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name, mark_inode_dirty(old_inode); inode_inc_iversion(old_dir); - old_dir->i_ctime = old_dir->i_mtime = current_time(old_dir); + fat_update_time(old_dir, NULL, S_MTIME|S_CTIME); if (IS_DIRSYNC(old_dir)) (void)fat_sync_inode(old_dir); else @@ -542,7 +542,7 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name, if (err) goto error_dotdot; inode_inc_iversion(old_dir); - old_dir->i_ctime = old_dir->i_mtime = ts; + fat_update_time(old_dir, &ts, S_MTIME|S_CTIME); if (IS_DIRSYNC(old_dir)) (void)fat_sync_inode(old_dir); else @@ -552,7 +552,7 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name, drop_nlink(new_inode); if (is_dir) drop_nlink(new_inode); - new_inode->i_ctime = ts; + fat_update_time(new_inode, &ts, S_CTIME); } out: brelse(sinfo.bh); diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c index 3d24b44cb93d..c59593263232 100644 --- a/fs/fat/namei_vfat.c +++ b/fs/fat/namei_vfat.c @@ -678,7 +678,7 @@ static int vfat_add_entry(struct inode *dir, const struct qstr *qname, goto cleanup; /* update timestamp */ - dir->i_ctime = dir->i_mtime = dir->i_atime = *ts; + fat_update_time(dir, ts, S_ATIME|S_MTIME|S_CTIME); if (IS_DIRSYNC(dir)) (void)fat_sync_inode(dir); else @@ -790,7 +790,7 @@ static int vfat_create(struct inode *dir, struct dentry *dentry, umode_t mode, goto out; } inode_inc_iversion(inode); - inode->i_mtime = inode->i_atime = inode->i_ctime = ts; + fat_update_time(inode, &ts, S_ATIME|S_MTIME|S_CTIME); /* timestamp is already written, so mark_inode_dirty() is unneeded. */ d_instantiate(dentry, inode); @@ -821,7 +821,7 @@ static int vfat_rmdir(struct inode *dir, struct dentry *dentry) drop_nlink(dir); clear_nlink(inode); - inode->i_mtime = inode->i_atime = current_time(inode); + fat_update_time(inode, NULL, S_ATIME|S_MTIME); fat_detach(inode); vfat_d_version_set(dentry, inode_query_iversion(dir)); out: @@ -847,7 +847,7 @@ static int vfat_unlink(struct inode *dir, struct dentry *dentry) if (err) goto out; clear_nlink(inode); - inode->i_mtime = inode->i_atime = current_time(inode); + fat_update_time(inode, NULL, S_ATIME|S_MTIME); fat_detach(inode); vfat_d_version_set(dentry, inode_query_iversion(dir)); out: @@ -887,7 +887,7 @@ static int vfat_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) } inode_inc_iversion(inode); set_nlink(inode, 2); - inode->i_mtime = inode->i_atime = inode->i_ctime = ts; + fat_update_time(inode, &ts, S_ATIME|S_MTIME); /* timestamp is already written, so mark_inode_dirty() is unneeded. */ d_instantiate(dentry, inode); @@ -980,7 +980,7 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry, if (err) goto error_dotdot; inode_inc_iversion(old_dir); - old_dir->i_ctime = old_dir->i_mtime = ts; + fat_update_time(old_dir, &ts, S_MTIME|S_CTIME); if (IS_DIRSYNC(old_dir)) (void)fat_sync_inode(old_dir); else @@ -990,7 +990,7 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry, drop_nlink(new_inode); if (is_dir) drop_nlink(new_inode); - new_inode->i_ctime = ts; + fat_update_time(new_inode, &ts, S_CTIME); } out: brelse(sinfo.bh);