mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-26 03:09:34 +03:00
0f37d0c8be
Commit torvalds/linux@2233f31aad replaced ->readdir() with ->iterate() in struct file_operations. All filesystems must now use the new ->iterate method. To handle this the code was reworked to use the new ->iterate interface. Care was taken to keep the majority of changes confined to the ZPL layer which is already Linux specific. However, minor changes were required to the common zfs_readdir() function. Compatibility with older kernels was accomplished by adding versions of the trivial dir_emit* helper functions. Also the various *_readdir() functions were reworked in to wrappers which create a dir_context structure to pass to the new *_iterate() functions. Unfortunately, the new dir_emit* functions prevent us from passing a private pointer to the filldir function. The xattr directory code leveraged this ability through zfs_readdir() to generate the list of xattr names. Since we can no longer use zfs_readdir() a simplified zpl_xattr_readdir() function was added to perform the same task. Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #1653 Issue #1591
152 lines
4.4 KiB
C
152 lines
4.4 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/vfs.h>
|
|
#include <linux/vfs_compat.h>
|
|
#include <linux/xattr_compat.h>
|
|
#include <linux/dcache_compat.h>
|
|
#include <linux/exportfs.h>
|
|
#include <linux/writeback.h>
|
|
#include <linux/falloc.h>
|
|
|
|
/* zpl_inode.c */
|
|
extern void zpl_vap_init(vattr_t *vap, struct inode *dir,
|
|
zpl_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;
|
|
extern dentry_operations_t zpl_dentry_operations;
|
|
|
|
/* zpl_file.c */
|
|
extern ssize_t zpl_read_common(struct inode *ip, const char *buf,
|
|
size_t len, loff_t pos, uio_seg_t segment, int flags, cred_t *cr);
|
|
extern ssize_t zpl_write_common(struct inode *ip, const char *buf,
|
|
size_t len, loff_t pos, uio_seg_t segment, int flags, cred_t *cr);
|
|
extern long zpl_fallocate_common(struct inode *ip, int mode,
|
|
loff_t offset, loff_t len);
|
|
|
|
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_sbs(int64_t bytes_to_scan, void *private);
|
|
|
|
typedef struct zpl_mount_data {
|
|
const char *z_osname; /* Dataset name */
|
|
void *z_data; /* Mount options string */
|
|
} zpl_mount_data_t;
|
|
|
|
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);
|
|
|
|
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;
|
|
#ifdef HAVE_AUTOMOUNT
|
|
extern const struct dentry_operations zpl_dops_snapdirs;
|
|
#else
|
|
extern const struct inode_operations zpl_ops_snapdirs;
|
|
#endif /* HAVE_AUTOMOUNT */
|
|
|
|
extern const struct file_operations zpl_fops_shares;
|
|
extern const struct inode_operations zpl_ops_shares;
|
|
|
|
#ifdef HAVE_VFS_ITERATE
|
|
|
|
#define DIR_CONTEXT_INIT(_dirent, _actor, _pos) { \
|
|
.actor = _actor, \
|
|
.pos = _pos, \
|
|
}
|
|
|
|
#else
|
|
|
|
typedef struct dir_context {
|
|
void *dirent;
|
|
const filldir_t actor;
|
|
loff_t pos;
|
|
} dir_context_t;
|
|
|
|
#define DIR_CONTEXT_INIT(_dirent, _actor, _pos) { \
|
|
.dirent = _dirent, \
|
|
.actor = _actor, \
|
|
.pos = _pos, \
|
|
}
|
|
|
|
static inline bool
|
|
dir_emit(struct dir_context *ctx, const char *name, int namelen,
|
|
uint64_t ino, unsigned type)
|
|
{
|
|
return ctx->actor(ctx->dirent, name, namelen, ctx->pos, ino, type) == 0;
|
|
}
|
|
|
|
static inline bool
|
|
dir_emit_dot(struct file *file, struct dir_context *ctx)
|
|
{
|
|
return ctx->actor(ctx->dirent, ".", 1, ctx->pos,
|
|
file->f_path.dentry->d_inode->i_ino, DT_DIR) == 0;
|
|
}
|
|
|
|
static inline bool
|
|
dir_emit_dotdot(struct file *file, struct dir_context *ctx)
|
|
{
|
|
return ctx->actor(ctx->dirent, "..", 2, ctx->pos,
|
|
parent_ino(file->f_path.dentry), DT_DIR) == 0;
|
|
}
|
|
|
|
static inline bool
|
|
dir_emit_dots(struct file *file, struct dir_context *ctx)
|
|
{
|
|
if (ctx->pos == 0) {
|
|
if (!dir_emit_dot(file, ctx))
|
|
return false;
|
|
ctx->pos = 1;
|
|
}
|
|
if (ctx->pos == 1) {
|
|
if (!dir_emit_dotdot(file, ctx))
|
|
return false;
|
|
ctx->pos = 2;
|
|
}
|
|
return true;
|
|
}
|
|
#endif /* HAVE_VFS_ITERATE */
|
|
|
|
#endif /* _SYS_ZPL_H */
|