mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
![Deepa Dinamani](/assets/img/avatar_default.png)
struct timespec is not y2038 safe. Transition vfs to use y2038 safe struct timespec64 instead. The change was made with the help of the following cocinelle script. This catches about 80% of the changes. All the header file and logic changes are included in the first 5 rules. The rest are trivial substitutions. I avoid changing any of the function signatures or any other filesystem specific data structures to keep the patch simple for review. The script can be a little shorter by combining different cases. But, this version was sufficient for my usecase. virtual patch @ depends on patch @ identifier now; @@ - struct timespec + struct timespec64 current_time ( ... ) { - struct timespec now = current_kernel_time(); + struct timespec64 now = current_kernel_time64(); ... - return timespec_trunc( + return timespec64_trunc( ... ); } @ depends on patch @ identifier xtime; @@ struct \( iattr \| inode \| kstat \) { ... - struct timespec xtime; + struct timespec64 xtime; ... } @ depends on patch @ identifier t; @@ struct inode_operations { ... int (*update_time) (..., - struct timespec t, + struct timespec64 t, ...); ... } @ depends on patch @ identifier t; identifier fn_update_time =~ "update_time$"; @@ fn_update_time (..., - struct timespec *t, + struct timespec64 *t, ...) { ... } @ depends on patch @ identifier t; @@ lease_get_mtime( ... , - struct timespec *t + struct timespec64 *t ) { ... } @te depends on patch forall@ identifier ts; local idexpression struct inode *inode_node; identifier i_xtime =~ "^i_[acm]time$"; identifier ia_xtime =~ "^ia_[acm]time$"; identifier fn_update_time =~ "update_time$"; identifier fn; expression e, E3; local idexpression struct inode *node1; local idexpression struct inode *node2; local idexpression struct iattr *attr1; local idexpression struct iattr *attr2; local idexpression struct iattr attr; identifier i_xtime1 =~ "^i_[acm]time$"; identifier i_xtime2 =~ "^i_[acm]time$"; identifier ia_xtime1 =~ "^ia_[acm]time$"; identifier ia_xtime2 =~ "^ia_[acm]time$"; @@ ( ( - struct timespec ts; + struct timespec64 ts; | - struct timespec ts = current_time(inode_node); + struct timespec64 ts = current_time(inode_node); ) <+... when != ts ( - timespec_equal(&inode_node->i_xtime, &ts) + timespec64_equal(&inode_node->i_xtime, &ts) | - timespec_equal(&ts, &inode_node->i_xtime) + timespec64_equal(&ts, &inode_node->i_xtime) | - timespec_compare(&inode_node->i_xtime, &ts) + timespec64_compare(&inode_node->i_xtime, &ts) | - timespec_compare(&ts, &inode_node->i_xtime) + timespec64_compare(&ts, &inode_node->i_xtime) | ts = current_time(e) | fn_update_time(..., &ts,...) | inode_node->i_xtime = ts | node1->i_xtime = ts | ts = inode_node->i_xtime | <+... attr1->ia_xtime ...+> = ts | ts = attr1->ia_xtime | ts.tv_sec | ts.tv_nsec | btrfs_set_stack_timespec_sec(..., ts.tv_sec) | btrfs_set_stack_timespec_nsec(..., ts.tv_nsec) | - ts = timespec64_to_timespec( + ts = ... -) | - ts = ktime_to_timespec( + ts = ktime_to_timespec64( ...) | - ts = E3 + ts = timespec_to_timespec64(E3) | - ktime_get_real_ts(&ts) + ktime_get_real_ts64(&ts) | fn(..., - ts + timespec64_to_timespec(ts) ,...) ) ...+> ( <... when != ts - return ts; + return timespec64_to_timespec(ts); ...> ) | - timespec_equal(&node1->i_xtime1, &node2->i_xtime2) + timespec64_equal(&node1->i_xtime2, &node2->i_xtime2) | - timespec_equal(&node1->i_xtime1, &attr2->ia_xtime2) + timespec64_equal(&node1->i_xtime2, &attr2->ia_xtime2) | - timespec_compare(&node1->i_xtime1, &node2->i_xtime2) + timespec64_compare(&node1->i_xtime1, &node2->i_xtime2) | node1->i_xtime1 = - timespec_trunc(attr1->ia_xtime1, + timespec64_trunc(attr1->ia_xtime1, ...) | - attr1->ia_xtime1 = timespec_trunc(attr2->ia_xtime2, + attr1->ia_xtime1 = timespec64_trunc(attr2->ia_xtime2, ...) | - ktime_get_real_ts(&attr1->ia_xtime1) + ktime_get_real_ts64(&attr1->ia_xtime1) | - ktime_get_real_ts(&attr.ia_xtime1) + ktime_get_real_ts64(&attr.ia_xtime1) ) @ depends on patch @ struct inode *node; struct iattr *attr; identifier fn; identifier i_xtime =~ "^i_[acm]time$"; identifier ia_xtime =~ "^ia_[acm]time$"; expression e; @@ ( - fn(node->i_xtime); + fn(timespec64_to_timespec(node->i_xtime)); | fn(..., - node->i_xtime); + timespec64_to_timespec(node->i_xtime)); | - e = fn(attr->ia_xtime); + e = fn(timespec64_to_timespec(attr->ia_xtime)); ) @ depends on patch forall @ struct inode *node; struct iattr *attr; identifier i_xtime =~ "^i_[acm]time$"; identifier ia_xtime =~ "^ia_[acm]time$"; identifier fn; @@ { + struct timespec ts; <+... ( + ts = timespec64_to_timespec(node->i_xtime); fn (..., - &node->i_xtime, + &ts, ...); | + ts = timespec64_to_timespec(attr->ia_xtime); fn (..., - &attr->ia_xtime, + &ts, ...); ) ...+> } @ depends on patch forall @ struct inode *node; struct iattr *attr; struct kstat *stat; identifier ia_xtime =~ "^ia_[acm]time$"; identifier i_xtime =~ "^i_[acm]time$"; identifier xtime =~ "^[acm]time$"; identifier fn, ret; @@ { + struct timespec ts; <+... ( + ts = timespec64_to_timespec(node->i_xtime); ret = fn (..., - &node->i_xtime, + &ts, ...); | + ts = timespec64_to_timespec(node->i_xtime); ret = fn (..., - &node->i_xtime); + &ts); | + ts = timespec64_to_timespec(attr->ia_xtime); ret = fn (..., - &attr->ia_xtime, + &ts, ...); | + ts = timespec64_to_timespec(attr->ia_xtime); ret = fn (..., - &attr->ia_xtime); + &ts); | + ts = timespec64_to_timespec(stat->xtime); ret = fn (..., - &stat->xtime); + &ts); ) ...+> } @ depends on patch @ struct inode *node; struct inode *node2; identifier i_xtime1 =~ "^i_[acm]time$"; identifier i_xtime2 =~ "^i_[acm]time$"; identifier i_xtime3 =~ "^i_[acm]time$"; struct iattr *attrp; struct iattr *attrp2; struct iattr attr ; identifier ia_xtime1 =~ "^ia_[acm]time$"; identifier ia_xtime2 =~ "^ia_[acm]time$"; struct kstat *stat; struct kstat stat1; struct timespec64 ts; identifier xtime =~ "^[acmb]time$"; expression e; @@ ( ( node->i_xtime2 \| attrp->ia_xtime2 \| attr.ia_xtime2 \) = node->i_xtime1 ; | node->i_xtime2 = \( node2->i_xtime1 \| timespec64_trunc(...) \); | node->i_xtime2 = node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \); | node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \); | stat->xtime = node2->i_xtime1; | stat1.xtime = node2->i_xtime1; | ( node->i_xtime2 \| attrp->ia_xtime2 \) = attrp->ia_xtime1 ; | ( attrp->ia_xtime1 \| attr.ia_xtime1 \) = attrp2->ia_xtime2; | - e = node->i_xtime1; + e = timespec64_to_timespec( node->i_xtime1 ); | - e = attrp->ia_xtime1; + e = timespec64_to_timespec( attrp->ia_xtime1 ); | node->i_xtime1 = current_time(...); | node->i_xtime2 = node->i_xtime1 = node->i_xtime3 = - e; + timespec_to_timespec64(e); | node->i_xtime1 = node->i_xtime3 = - e; + timespec_to_timespec64(e); | - node->i_xtime1 = e; + node->i_xtime1 = timespec_to_timespec64(e); ) Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com> Cc: <anton@tuxera.com> Cc: <balbi@kernel.org> Cc: <bfields@fieldses.org> Cc: <darrick.wong@oracle.com> Cc: <dhowells@redhat.com> Cc: <dsterba@suse.com> Cc: <dwmw2@infradead.org> Cc: <hch@lst.de> Cc: <hirofumi@mail.parknet.co.jp> Cc: <hubcap@omnibond.com> Cc: <jack@suse.com> Cc: <jaegeuk@kernel.org> Cc: <jaharkes@cs.cmu.edu> Cc: <jslaby@suse.com> Cc: <keescook@chromium.org> Cc: <mark@fasheh.com> Cc: <miklos@szeredi.hu> Cc: <nico@linaro.org> Cc: <reiserfs-devel@vger.kernel.org> Cc: <richard@nod.at> Cc: <sage@redhat.com> Cc: <sfrench@samba.org> Cc: <swhiteho@redhat.com> Cc: <tj@kernel.org> Cc: <trond.myklebust@primarydata.com> Cc: <tytso@mit.edu> Cc: <viro@zeniv.linux.org.uk>
282 lines
7.3 KiB
C
282 lines
7.3 KiB
C
/* -*- mode: c; c-basic-offset: 8; -*-
|
|
* vim: noexpandtab sw=8 ts=8 sts=0:
|
|
*
|
|
* inode.c - basic inode and dentry operations.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public
|
|
* License along with this program; if not, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
* Boston, MA 021110-1307, USA.
|
|
*
|
|
* Based on sysfs:
|
|
* sysfs is Copyright (C) 2001, 2002, 2003 Patrick Mochel
|
|
*
|
|
* configfs Copyright (C) 2005 Oracle. All rights reserved.
|
|
*
|
|
* Please see Documentation/filesystems/configfs/configfs.txt for more
|
|
* information.
|
|
*/
|
|
|
|
#undef DEBUG
|
|
|
|
#include <linux/pagemap.h>
|
|
#include <linux/namei.h>
|
|
#include <linux/backing-dev.h>
|
|
#include <linux/capability.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/lockdep.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/configfs.h>
|
|
#include "configfs_internal.h"
|
|
|
|
#ifdef CONFIG_LOCKDEP
|
|
static struct lock_class_key default_group_class[MAX_LOCK_DEPTH];
|
|
#endif
|
|
|
|
static const struct address_space_operations configfs_aops = {
|
|
.readpage = simple_readpage,
|
|
.write_begin = simple_write_begin,
|
|
.write_end = simple_write_end,
|
|
};
|
|
|
|
static const struct inode_operations configfs_inode_operations ={
|
|
.setattr = configfs_setattr,
|
|
};
|
|
|
|
int configfs_setattr(struct dentry * dentry, struct iattr * iattr)
|
|
{
|
|
struct inode * inode = d_inode(dentry);
|
|
struct configfs_dirent * sd = dentry->d_fsdata;
|
|
struct iattr * sd_iattr;
|
|
unsigned int ia_valid = iattr->ia_valid;
|
|
int error;
|
|
|
|
if (!sd)
|
|
return -EINVAL;
|
|
|
|
sd_iattr = sd->s_iattr;
|
|
if (!sd_iattr) {
|
|
/* setting attributes for the first time, allocate now */
|
|
sd_iattr = kzalloc(sizeof(struct iattr), GFP_KERNEL);
|
|
if (!sd_iattr)
|
|
return -ENOMEM;
|
|
/* assign default attributes */
|
|
sd_iattr->ia_mode = sd->s_mode;
|
|
sd_iattr->ia_uid = GLOBAL_ROOT_UID;
|
|
sd_iattr->ia_gid = GLOBAL_ROOT_GID;
|
|
sd_iattr->ia_atime = sd_iattr->ia_mtime =
|
|
sd_iattr->ia_ctime = current_time(inode);
|
|
sd->s_iattr = sd_iattr;
|
|
}
|
|
/* attributes were changed atleast once in past */
|
|
|
|
error = simple_setattr(dentry, iattr);
|
|
if (error)
|
|
return error;
|
|
|
|
if (ia_valid & ATTR_UID)
|
|
sd_iattr->ia_uid = iattr->ia_uid;
|
|
if (ia_valid & ATTR_GID)
|
|
sd_iattr->ia_gid = iattr->ia_gid;
|
|
if (ia_valid & ATTR_ATIME)
|
|
sd_iattr->ia_atime = timespec64_trunc(iattr->ia_atime,
|
|
inode->i_sb->s_time_gran);
|
|
if (ia_valid & ATTR_MTIME)
|
|
sd_iattr->ia_mtime = timespec64_trunc(iattr->ia_mtime,
|
|
inode->i_sb->s_time_gran);
|
|
if (ia_valid & ATTR_CTIME)
|
|
sd_iattr->ia_ctime = timespec64_trunc(iattr->ia_ctime,
|
|
inode->i_sb->s_time_gran);
|
|
if (ia_valid & ATTR_MODE) {
|
|
umode_t mode = iattr->ia_mode;
|
|
|
|
if (!in_group_p(inode->i_gid) && !capable(CAP_FSETID))
|
|
mode &= ~S_ISGID;
|
|
sd_iattr->ia_mode = sd->s_mode = mode;
|
|
}
|
|
|
|
return error;
|
|
}
|
|
|
|
static inline void set_default_inode_attr(struct inode * inode, umode_t mode)
|
|
{
|
|
inode->i_mode = mode;
|
|
inode->i_atime = inode->i_mtime =
|
|
inode->i_ctime = current_time(inode);
|
|
}
|
|
|
|
static inline void set_inode_attr(struct inode * inode, struct iattr * iattr)
|
|
{
|
|
inode->i_mode = iattr->ia_mode;
|
|
inode->i_uid = iattr->ia_uid;
|
|
inode->i_gid = iattr->ia_gid;
|
|
inode->i_atime = iattr->ia_atime;
|
|
inode->i_mtime = iattr->ia_mtime;
|
|
inode->i_ctime = iattr->ia_ctime;
|
|
}
|
|
|
|
struct inode *configfs_new_inode(umode_t mode, struct configfs_dirent *sd,
|
|
struct super_block *s)
|
|
{
|
|
struct inode * inode = new_inode(s);
|
|
if (inode) {
|
|
inode->i_ino = get_next_ino();
|
|
inode->i_mapping->a_ops = &configfs_aops;
|
|
inode->i_op = &configfs_inode_operations;
|
|
|
|
if (sd->s_iattr) {
|
|
/* sysfs_dirent has non-default attributes
|
|
* get them for the new inode from persistent copy
|
|
* in sysfs_dirent
|
|
*/
|
|
set_inode_attr(inode, sd->s_iattr);
|
|
} else
|
|
set_default_inode_attr(inode, mode);
|
|
}
|
|
return inode;
|
|
}
|
|
|
|
#ifdef CONFIG_LOCKDEP
|
|
|
|
static void configfs_set_inode_lock_class(struct configfs_dirent *sd,
|
|
struct inode *inode)
|
|
{
|
|
int depth = sd->s_depth;
|
|
|
|
if (depth > 0) {
|
|
if (depth <= ARRAY_SIZE(default_group_class)) {
|
|
lockdep_set_class(&inode->i_rwsem,
|
|
&default_group_class[depth - 1]);
|
|
} else {
|
|
/*
|
|
* In practice the maximum level of locking depth is
|
|
* already reached. Just inform about possible reasons.
|
|
*/
|
|
pr_info("Too many levels of inodes for the locking correctness validator.\n");
|
|
pr_info("Spurious warnings may appear.\n");
|
|
}
|
|
}
|
|
}
|
|
|
|
#else /* CONFIG_LOCKDEP */
|
|
|
|
static void configfs_set_inode_lock_class(struct configfs_dirent *sd,
|
|
struct inode *inode)
|
|
{
|
|
}
|
|
|
|
#endif /* CONFIG_LOCKDEP */
|
|
|
|
int configfs_create(struct dentry * dentry, umode_t mode, void (*init)(struct inode *))
|
|
{
|
|
int error = 0;
|
|
struct inode *inode = NULL;
|
|
struct configfs_dirent *sd;
|
|
struct inode *p_inode;
|
|
|
|
if (!dentry)
|
|
return -ENOENT;
|
|
|
|
if (d_really_is_positive(dentry))
|
|
return -EEXIST;
|
|
|
|
sd = dentry->d_fsdata;
|
|
inode = configfs_new_inode(mode, sd, dentry->d_sb);
|
|
if (!inode)
|
|
return -ENOMEM;
|
|
|
|
p_inode = d_inode(dentry->d_parent);
|
|
p_inode->i_mtime = p_inode->i_ctime = current_time(p_inode);
|
|
configfs_set_inode_lock_class(sd, inode);
|
|
|
|
init(inode);
|
|
if (S_ISDIR(mode) || S_ISLNK(mode)) {
|
|
/*
|
|
* ->symlink(), ->mkdir(), configfs_register_subsystem() or
|
|
* create_default_group() - already hashed.
|
|
*/
|
|
d_instantiate(dentry, inode);
|
|
dget(dentry); /* pin link and directory dentries in core */
|
|
} else {
|
|
/* ->lookup() */
|
|
d_add(dentry, inode);
|
|
}
|
|
return error;
|
|
}
|
|
|
|
/*
|
|
* Get the name for corresponding element represented by the given configfs_dirent
|
|
*/
|
|
const unsigned char * configfs_get_name(struct configfs_dirent *sd)
|
|
{
|
|
struct configfs_attribute *attr;
|
|
|
|
BUG_ON(!sd || !sd->s_element);
|
|
|
|
/* These always have a dentry, so use that */
|
|
if (sd->s_type & (CONFIGFS_DIR | CONFIGFS_ITEM_LINK))
|
|
return sd->s_dentry->d_name.name;
|
|
|
|
if (sd->s_type & (CONFIGFS_ITEM_ATTR | CONFIGFS_ITEM_BIN_ATTR)) {
|
|
attr = sd->s_element;
|
|
return attr->ca_name;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
|
|
/*
|
|
* Unhashes the dentry corresponding to given configfs_dirent
|
|
* Called with parent inode's i_mutex held.
|
|
*/
|
|
void configfs_drop_dentry(struct configfs_dirent * sd, struct dentry * parent)
|
|
{
|
|
struct dentry * dentry = sd->s_dentry;
|
|
|
|
if (dentry) {
|
|
spin_lock(&dentry->d_lock);
|
|
if (simple_positive(dentry)) {
|
|
dget_dlock(dentry);
|
|
__d_drop(dentry);
|
|
spin_unlock(&dentry->d_lock);
|
|
simple_unlink(d_inode(parent), dentry);
|
|
} else
|
|
spin_unlock(&dentry->d_lock);
|
|
}
|
|
}
|
|
|
|
void configfs_hash_and_remove(struct dentry * dir, const char * name)
|
|
{
|
|
struct configfs_dirent * sd;
|
|
struct configfs_dirent * parent_sd = dir->d_fsdata;
|
|
|
|
if (d_really_is_negative(dir))
|
|
/* no inode means this hasn't been made visible yet */
|
|
return;
|
|
|
|
inode_lock(d_inode(dir));
|
|
list_for_each_entry(sd, &parent_sd->s_children, s_sibling) {
|
|
if (!sd->s_element)
|
|
continue;
|
|
if (!strcmp(configfs_get_name(sd), name)) {
|
|
spin_lock(&configfs_dirent_lock);
|
|
list_del_init(&sd->s_sibling);
|
|
spin_unlock(&configfs_dirent_lock);
|
|
configfs_drop_dentry(sd, dir);
|
|
configfs_put(sd);
|
|
break;
|
|
}
|
|
}
|
|
inode_unlock(d_inode(dir));
|
|
}
|