mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-28 11:49:32 +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>
243 lines
5.3 KiB
C
243 lines
5.3 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* linux/fs/bad_inode.c
|
|
*
|
|
* Copyright (C) 1997, Stephen Tweedie
|
|
*
|
|
* Provide stub functions for unreadable inodes
|
|
*
|
|
* Fabian Frederick : August 2003 - All file operations assigned to EIO
|
|
*/
|
|
|
|
#include <linux/fs.h>
|
|
#include <linux/export.h>
|
|
#include <linux/stat.h>
|
|
#include <linux/time.h>
|
|
#include <linux/namei.h>
|
|
#include <linux/poll.h>
|
|
|
|
static int bad_file_open(struct inode *inode, struct file *filp)
|
|
{
|
|
return -EIO;
|
|
}
|
|
|
|
static const struct file_operations bad_file_ops =
|
|
{
|
|
.open = bad_file_open,
|
|
};
|
|
|
|
static int bad_inode_create (struct inode *dir, struct dentry *dentry,
|
|
umode_t mode, bool excl)
|
|
{
|
|
return -EIO;
|
|
}
|
|
|
|
static struct dentry *bad_inode_lookup(struct inode *dir,
|
|
struct dentry *dentry, unsigned int flags)
|
|
{
|
|
return ERR_PTR(-EIO);
|
|
}
|
|
|
|
static int bad_inode_link (struct dentry *old_dentry, struct inode *dir,
|
|
struct dentry *dentry)
|
|
{
|
|
return -EIO;
|
|
}
|
|
|
|
static int bad_inode_unlink(struct inode *dir, struct dentry *dentry)
|
|
{
|
|
return -EIO;
|
|
}
|
|
|
|
static int bad_inode_symlink (struct inode *dir, struct dentry *dentry,
|
|
const char *symname)
|
|
{
|
|
return -EIO;
|
|
}
|
|
|
|
static int bad_inode_mkdir(struct inode *dir, struct dentry *dentry,
|
|
umode_t mode)
|
|
{
|
|
return -EIO;
|
|
}
|
|
|
|
static int bad_inode_rmdir (struct inode *dir, struct dentry *dentry)
|
|
{
|
|
return -EIO;
|
|
}
|
|
|
|
static int bad_inode_mknod (struct inode *dir, struct dentry *dentry,
|
|
umode_t mode, dev_t rdev)
|
|
{
|
|
return -EIO;
|
|
}
|
|
|
|
static int bad_inode_rename2(struct inode *old_dir, struct dentry *old_dentry,
|
|
struct inode *new_dir, struct dentry *new_dentry,
|
|
unsigned int flags)
|
|
{
|
|
return -EIO;
|
|
}
|
|
|
|
static int bad_inode_readlink(struct dentry *dentry, char __user *buffer,
|
|
int buflen)
|
|
{
|
|
return -EIO;
|
|
}
|
|
|
|
static int bad_inode_permission(struct inode *inode, int mask)
|
|
{
|
|
return -EIO;
|
|
}
|
|
|
|
static int bad_inode_getattr(const struct path *path, struct kstat *stat,
|
|
u32 request_mask, unsigned int query_flags)
|
|
{
|
|
return -EIO;
|
|
}
|
|
|
|
static int bad_inode_setattr(struct dentry *direntry, struct iattr *attrs)
|
|
{
|
|
return -EIO;
|
|
}
|
|
|
|
static ssize_t bad_inode_listxattr(struct dentry *dentry, char *buffer,
|
|
size_t buffer_size)
|
|
{
|
|
return -EIO;
|
|
}
|
|
|
|
static const char *bad_inode_get_link(struct dentry *dentry,
|
|
struct inode *inode,
|
|
struct delayed_call *done)
|
|
{
|
|
return ERR_PTR(-EIO);
|
|
}
|
|
|
|
static struct posix_acl *bad_inode_get_acl(struct inode *inode, int type)
|
|
{
|
|
return ERR_PTR(-EIO);
|
|
}
|
|
|
|
static int bad_inode_fiemap(struct inode *inode,
|
|
struct fiemap_extent_info *fieinfo, u64 start,
|
|
u64 len)
|
|
{
|
|
return -EIO;
|
|
}
|
|
|
|
static int bad_inode_update_time(struct inode *inode, struct timespec64 *time,
|
|
int flags)
|
|
{
|
|
return -EIO;
|
|
}
|
|
|
|
static int bad_inode_atomic_open(struct inode *inode, struct dentry *dentry,
|
|
struct file *file, unsigned int open_flag,
|
|
umode_t create_mode, int *opened)
|
|
{
|
|
return -EIO;
|
|
}
|
|
|
|
static int bad_inode_tmpfile(struct inode *inode, struct dentry *dentry,
|
|
umode_t mode)
|
|
{
|
|
return -EIO;
|
|
}
|
|
|
|
static int bad_inode_set_acl(struct inode *inode, struct posix_acl *acl,
|
|
int type)
|
|
{
|
|
return -EIO;
|
|
}
|
|
|
|
static const struct inode_operations bad_inode_ops =
|
|
{
|
|
.create = bad_inode_create,
|
|
.lookup = bad_inode_lookup,
|
|
.link = bad_inode_link,
|
|
.unlink = bad_inode_unlink,
|
|
.symlink = bad_inode_symlink,
|
|
.mkdir = bad_inode_mkdir,
|
|
.rmdir = bad_inode_rmdir,
|
|
.mknod = bad_inode_mknod,
|
|
.rename = bad_inode_rename2,
|
|
.readlink = bad_inode_readlink,
|
|
.permission = bad_inode_permission,
|
|
.getattr = bad_inode_getattr,
|
|
.setattr = bad_inode_setattr,
|
|
.listxattr = bad_inode_listxattr,
|
|
.get_link = bad_inode_get_link,
|
|
.get_acl = bad_inode_get_acl,
|
|
.fiemap = bad_inode_fiemap,
|
|
.update_time = bad_inode_update_time,
|
|
.atomic_open = bad_inode_atomic_open,
|
|
.tmpfile = bad_inode_tmpfile,
|
|
.set_acl = bad_inode_set_acl,
|
|
};
|
|
|
|
|
|
/*
|
|
* When a filesystem is unable to read an inode due to an I/O error in
|
|
* its read_inode() function, it can call make_bad_inode() to return a
|
|
* set of stubs which will return EIO errors as required.
|
|
*
|
|
* We only need to do limited initialisation: all other fields are
|
|
* preinitialised to zero automatically.
|
|
*/
|
|
|
|
/**
|
|
* make_bad_inode - mark an inode bad due to an I/O error
|
|
* @inode: Inode to mark bad
|
|
*
|
|
* When an inode cannot be read due to a media or remote network
|
|
* failure this function makes the inode "bad" and causes I/O operations
|
|
* on it to fail from this point on.
|
|
*/
|
|
|
|
void make_bad_inode(struct inode *inode)
|
|
{
|
|
remove_inode_hash(inode);
|
|
|
|
inode->i_mode = S_IFREG;
|
|
inode->i_atime = inode->i_mtime = inode->i_ctime =
|
|
current_time(inode);
|
|
inode->i_op = &bad_inode_ops;
|
|
inode->i_opflags &= ~IOP_XATTR;
|
|
inode->i_fop = &bad_file_ops;
|
|
}
|
|
EXPORT_SYMBOL(make_bad_inode);
|
|
|
|
/*
|
|
* This tests whether an inode has been flagged as bad. The test uses
|
|
* &bad_inode_ops to cover the case of invalidated inodes as well as
|
|
* those created by make_bad_inode() above.
|
|
*/
|
|
|
|
/**
|
|
* is_bad_inode - is an inode errored
|
|
* @inode: inode to test
|
|
*
|
|
* Returns true if the inode in question has been marked as bad.
|
|
*/
|
|
|
|
bool is_bad_inode(struct inode *inode)
|
|
{
|
|
return (inode->i_op == &bad_inode_ops);
|
|
}
|
|
|
|
EXPORT_SYMBOL(is_bad_inode);
|
|
|
|
/**
|
|
* iget_failed - Mark an under-construction inode as dead and release it
|
|
* @inode: The inode to discard
|
|
*
|
|
* Mark an under-construction inode as dead and release it.
|
|
*/
|
|
void iget_failed(struct inode *inode)
|
|
{
|
|
make_bad_inode(inode);
|
|
unlock_new_inode(inode);
|
|
iput(inode);
|
|
}
|
|
EXPORT_SYMBOL(iget_failed);
|