mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2025-02-23 23:44:35 +03:00

In Linux commit 13bc24457850583a2e7203ded05b7209ab4bc5ef, direct access
to the i_ctime member of struct inode was removed. The new approach is
to use accessor methods that exclusively handle passing the timestamp
around by value. This change adds new tests for each of these functions
and introduces zpl_* equivalents in include/os/linux/zfs/sys/zpl.h. In
where the inode_get/set_ctime*() functions exist, these zpl_* calls will
be mapped to the new functions. On older kernels, these macros just wrap
direct-access calls. The code that operated on an address of ip->i_ctime
to call ZFS_TIME_DECODE() now will take a local copy using
zpl_inode_get_ctime(), and then pass the address of the local copy when
performing the ZFS_TIME_DECODE() call, in all cases, rather than
directly accessing the member.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Coleman Kane <ckane@colemankane.org>
Closes #15263
Closes #15257
(cherry picked from commit fe9d409e90
)
222 lines
6.7 KiB
C
222 lines
6.7 KiB
C
/*
|
|
* CDDL HEADER START
|
|
*
|
|
* The contents of this file are subject to the terms of the
|
|
* Common Development and Distribution License (the "License").
|
|
* You may not use this file except in compliance with the License.
|
|
*
|
|
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
|
* or http://www.opensolaris.org/os/licensing.
|
|
* See the License for the specific language governing permissions
|
|
* and limitations under the License.
|
|
*
|
|
* When distributing Covered Code, include this CDDL HEADER in each
|
|
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
|
* If applicable, add the following below this CDDL HEADER, with the
|
|
* fields enclosed by brackets "[]" replaced with your own identifying
|
|
* information: Portions Copyright [yyyy] [name of copyright owner]
|
|
*
|
|
* CDDL HEADER END
|
|
*/
|
|
/*
|
|
* Copyright (c) 2011, Lawrence Livermore National Security, LLC.
|
|
*/
|
|
|
|
#ifndef _SYS_ZPL_H
|
|
#define _SYS_ZPL_H
|
|
|
|
#include <sys/mntent.h>
|
|
#include <sys/vfs.h>
|
|
#include <linux/aio.h>
|
|
#include <linux/dcache_compat.h>
|
|
#include <linux/exportfs.h>
|
|
#include <linux/falloc.h>
|
|
#include <linux/parser.h>
|
|
#include <linux/task_io_accounting_ops.h>
|
|
#include <linux/vfs_compat.h>
|
|
#include <linux/writeback.h>
|
|
#include <linux/xattr_compat.h>
|
|
|
|
/* zpl_inode.c */
|
|
extern void zpl_vap_init(vattr_t *vap, struct inode *dir,
|
|
umode_t mode, cred_t *cr);
|
|
|
|
extern const struct inode_operations zpl_inode_operations;
|
|
extern const struct inode_operations zpl_dir_inode_operations;
|
|
extern const struct inode_operations zpl_symlink_inode_operations;
|
|
extern const struct inode_operations zpl_special_inode_operations;
|
|
|
|
/* zpl_file.c */
|
|
extern const struct address_space_operations zpl_address_space_operations;
|
|
extern const struct file_operations zpl_file_operations;
|
|
extern const struct file_operations zpl_dir_file_operations;
|
|
|
|
/* zpl_super.c */
|
|
extern void zpl_prune_sb(int64_t nr_to_scan, void *arg);
|
|
|
|
extern const struct super_operations zpl_super_operations;
|
|
extern const struct export_operations zpl_export_operations;
|
|
extern struct file_system_type zpl_fs_type;
|
|
|
|
/* zpl_xattr.c */
|
|
extern ssize_t zpl_xattr_list(struct dentry *dentry, char *buf, size_t size);
|
|
extern int zpl_xattr_security_init(struct inode *ip, struct inode *dip,
|
|
const struct qstr *qstr);
|
|
#if defined(CONFIG_FS_POSIX_ACL)
|
|
#if defined(HAVE_SET_ACL)
|
|
#if defined(HAVE_SET_ACL_IDMAP_DENTRY)
|
|
extern int zpl_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,
|
|
struct posix_acl *acl, int type);
|
|
#elif defined(HAVE_SET_ACL_USERNS)
|
|
extern int zpl_set_acl(struct user_namespace *userns, struct inode *ip,
|
|
struct posix_acl *acl, int type);
|
|
#elif defined(HAVE_SET_ACL_USERNS_DENTRY_ARG2)
|
|
extern int zpl_set_acl(struct user_namespace *userns, struct dentry *dentry,
|
|
struct posix_acl *acl, int type);
|
|
#else
|
|
extern int zpl_set_acl(struct inode *ip, struct posix_acl *acl, int type);
|
|
#endif /* HAVE_SET_ACL_USERNS */
|
|
#endif /* HAVE_SET_ACL */
|
|
#if defined(HAVE_GET_ACL_RCU) || defined(HAVE_GET_INODE_ACL)
|
|
extern struct posix_acl *zpl_get_acl(struct inode *ip, int type, bool rcu);
|
|
#elif defined(HAVE_GET_ACL)
|
|
extern struct posix_acl *zpl_get_acl(struct inode *ip, int type);
|
|
#endif
|
|
extern int zpl_init_acl(struct inode *ip, struct inode *dir);
|
|
extern int zpl_chmod_acl(struct inode *ip);
|
|
#else
|
|
static inline int
|
|
zpl_init_acl(struct inode *ip, struct inode *dir)
|
|
{
|
|
return (0);
|
|
}
|
|
|
|
static inline int
|
|
zpl_chmod_acl(struct inode *ip)
|
|
{
|
|
return (0);
|
|
}
|
|
#endif /* CONFIG_FS_POSIX_ACL */
|
|
|
|
extern xattr_handler_t *zpl_xattr_handlers[];
|
|
|
|
/* zpl_ctldir.c */
|
|
extern const struct file_operations zpl_fops_root;
|
|
extern const struct inode_operations zpl_ops_root;
|
|
|
|
extern const struct file_operations zpl_fops_snapdir;
|
|
extern const struct inode_operations zpl_ops_snapdir;
|
|
extern const struct dentry_operations zpl_dops_snapdirs;
|
|
|
|
extern const struct file_operations zpl_fops_shares;
|
|
extern const struct inode_operations zpl_ops_shares;
|
|
|
|
#if defined(HAVE_VFS_ITERATE) || defined(HAVE_VFS_ITERATE_SHARED)
|
|
|
|
#define ZPL_DIR_CONTEXT_INIT(_dirent, _actor, _pos) { \
|
|
.actor = _actor, \
|
|
.pos = _pos, \
|
|
}
|
|
|
|
typedef struct dir_context zpl_dir_context_t;
|
|
|
|
#define zpl_dir_emit dir_emit
|
|
#define zpl_dir_emit_dot dir_emit_dot
|
|
#define zpl_dir_emit_dotdot dir_emit_dotdot
|
|
#define zpl_dir_emit_dots dir_emit_dots
|
|
|
|
#else
|
|
|
|
typedef struct zpl_dir_context {
|
|
void *dirent;
|
|
const filldir_t actor;
|
|
loff_t pos;
|
|
} zpl_dir_context_t;
|
|
|
|
#define ZPL_DIR_CONTEXT_INIT(_dirent, _actor, _pos) { \
|
|
.dirent = _dirent, \
|
|
.actor = _actor, \
|
|
.pos = _pos, \
|
|
}
|
|
|
|
static inline bool
|
|
zpl_dir_emit(zpl_dir_context_t *ctx, const char *name, int namelen,
|
|
uint64_t ino, unsigned type)
|
|
{
|
|
return (!ctx->actor(ctx->dirent, name, namelen, ctx->pos, ino, type));
|
|
}
|
|
|
|
static inline bool
|
|
zpl_dir_emit_dot(struct file *file, zpl_dir_context_t *ctx)
|
|
{
|
|
return (ctx->actor(ctx->dirent, ".", 1, ctx->pos,
|
|
file_inode(file)->i_ino, DT_DIR) == 0);
|
|
}
|
|
|
|
static inline bool
|
|
zpl_dir_emit_dotdot(struct file *file, zpl_dir_context_t *ctx)
|
|
{
|
|
return (ctx->actor(ctx->dirent, "..", 2, ctx->pos,
|
|
parent_ino(file_dentry(file)), DT_DIR) == 0);
|
|
}
|
|
|
|
static inline bool
|
|
zpl_dir_emit_dots(struct file *file, zpl_dir_context_t *ctx)
|
|
{
|
|
if (ctx->pos == 0) {
|
|
if (!zpl_dir_emit_dot(file, ctx))
|
|
return (false);
|
|
ctx->pos = 1;
|
|
}
|
|
if (ctx->pos == 1) {
|
|
if (!zpl_dir_emit_dotdot(file, ctx))
|
|
return (false);
|
|
ctx->pos = 2;
|
|
}
|
|
return (true);
|
|
}
|
|
#endif /* HAVE_VFS_ITERATE */
|
|
|
|
#if defined(HAVE_INODE_TIMESTAMP_TRUNCATE)
|
|
#define zpl_inode_timestamp_truncate(ts, ip) timestamp_truncate(ts, ip)
|
|
#elif defined(HAVE_INODE_TIMESPEC64_TIMES)
|
|
#define zpl_inode_timestamp_truncate(ts, ip) \
|
|
timespec64_trunc(ts, (ip)->i_sb->s_time_gran)
|
|
#else
|
|
#define zpl_inode_timestamp_truncate(ts, ip) \
|
|
timespec_trunc(ts, (ip)->i_sb->s_time_gran)
|
|
#endif
|
|
|
|
#if defined(HAVE_INODE_OWNER_OR_CAPABLE)
|
|
#define zpl_inode_owner_or_capable(ns, ip) inode_owner_or_capable(ip)
|
|
#elif defined(HAVE_INODE_OWNER_OR_CAPABLE_USERNS)
|
|
#define zpl_inode_owner_or_capable(ns, ip) inode_owner_or_capable(ns, ip)
|
|
#elif defined(HAVE_INODE_OWNER_OR_CAPABLE_IDMAP)
|
|
#define zpl_inode_owner_or_capable(idmap, ip) inode_owner_or_capable(idmap, ip)
|
|
#else
|
|
#error "Unsupported kernel"
|
|
#endif
|
|
|
|
#if defined(HAVE_SETATTR_PREPARE_USERNS) || defined(HAVE_SETATTR_PREPARE_IDMAP)
|
|
#define zpl_setattr_prepare(ns, dentry, ia) setattr_prepare(ns, dentry, ia)
|
|
#else
|
|
/*
|
|
* Use kernel-provided version, or our own from
|
|
* linux/vfs_compat.h
|
|
*/
|
|
#define zpl_setattr_prepare(ns, dentry, ia) setattr_prepare(dentry, ia)
|
|
#endif
|
|
|
|
#ifdef HAVE_INODE_GET_CTIME
|
|
#define zpl_inode_get_ctime(ip) inode_get_ctime(ip)
|
|
#else
|
|
#define zpl_inode_get_ctime(ip) (ip->i_ctime)
|
|
#endif
|
|
#ifdef HAVE_INODE_SET_CTIME_TO_TS
|
|
#define zpl_inode_set_ctime_to_ts(ip, ts) inode_set_ctime_to_ts(ip, ts)
|
|
#else
|
|
#define zpl_inode_set_ctime_to_ts(ip, ts) (ip->i_ctime = ts)
|
|
#endif
|
|
|
|
#endif /* _SYS_ZPL_H */
|