diff options
| author | Brian Behlendorf <[email protected]> | 2017-03-08 17:56:19 -0500 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-03-10 09:51:35 -0800 |
| commit | f298b24ddf9695fb74603a257e2a58dd7baf0159 (patch) | |
| tree | 1af22ecf10386cfa79555bd819a8948491a9f338 /include | |
| parent | 0037b49e833a7073bee0ef3f6680f330f727769e (diff) | |
Rename zfs_* functions
Several functions were renamed when ZFS was originally ported to
Linux. Revert the code to the original names to minimize the
delta with upstream OpenZFS.
zfs_sb_teardown -> zfsvfs_teardown
zfs_sb_create -> zfsvfs_create
zfs_sb_setup -> zfsvfs_setup
zfs_sb_free -> zfsvfs_free
get_zfs_sb -> getzfsvfs
zfs_sb_hold -> zfsvfs_hold
zfs_sb_rele -> zfsvfs_rele
zfs_sb_prune_aliases -> zfs_prune_aliases (Linux-only)
zfs_sb_prune -> zfs_prune (Linux only)
Align the zfs_vnops.h and zfs_vfsops.h with upstream as much
as possible. Several prototypes were removed and those that
remain were reordered.
Move the EXPORT_SYMBOL lines to the end of the source files
for consistency with the other source files.
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sys/zfs_vfsops.h | 22 | ||||
| -rw-r--r-- | include/sys/zfs_vnops.h | 1 |
2 files changed, 7 insertions, 16 deletions
diff --git a/include/sys/zfs_vfsops.h b/include/sys/zfs_vfsops.h index 44a920edf..a208bc1f8 100644 --- a/include/sys/zfs_vfsops.h +++ b/include/sys/zfs_vfsops.h @@ -193,29 +193,21 @@ extern boolean_t zfs_fuid_overquota(zfsvfs_t *zfsvfs, boolean_t isgroup, extern boolean_t zfs_fuid_overobjquota(zfsvfs_t *zfsvfs, boolean_t isgroup, uint64_t fuid); extern int zfs_set_version(zfsvfs_t *zfsvfs, uint64_t newvers); -extern int zfs_get_zplprop(objset_t *os, zfs_prop_t prop, - uint64_t *value); -extern zfs_mntopts_t *zfs_mntopts_alloc(void); -extern void zfs_mntopts_free(zfs_mntopts_t *zmo); -extern int zfs_sb_create(const char *name, zfs_mntopts_t *zmo, - zfsvfs_t **zfvp); -extern int zfs_sb_setup(zfsvfs_t *zfsvfs, boolean_t mounting); -extern void zfs_sb_free(zfsvfs_t *zfsvfs); -extern int zfs_sb_prune(struct super_block *sb, unsigned long nr_to_scan, - int *objects); -extern int zfs_sb_teardown(zfsvfs_t *zfsvfs, boolean_t unmounting); +extern int zfsvfs_create(const char *name, zfs_mntopts_t *zmo, zfsvfs_t **zfvp); +extern void zfsvfs_free(zfsvfs_t *zfsvfs); extern int zfs_check_global_label(const char *dsname, const char *hexsl); -extern boolean_t zfs_is_readonly(zfsvfs_t *zfsvfs); -extern int zfs_register_callbacks(zfsvfs_t *zfsvfs); -extern void zfs_unregister_callbacks(zfsvfs_t *zfsvfs); +extern boolean_t zfs_is_readonly(zfsvfs_t *zfsvfs); +extern zfs_mntopts_t *zfs_mntopts_alloc(void); +extern void zfs_mntopts_free(zfs_mntopts_t *zmo); extern int zfs_domount(struct super_block *sb, zfs_mntopts_t *zmo, int silent); extern void zfs_preumount(struct super_block *sb); extern int zfs_umount(struct super_block *sb); extern int zfs_remount(struct super_block *sb, int *flags, zfs_mntopts_t *zmo); -extern int zfs_root(zfsvfs_t *zfsvfs, struct inode **ipp); extern int zfs_statvfs(struct dentry *dentry, struct kstatfs *statp); extern int zfs_vget(struct super_block *sb, struct inode **ipp, fid_t *fidp); +extern int zfs_prune(struct super_block *sb, unsigned long nr_to_scan, + int *objects); #ifdef __cplusplus } diff --git a/include/sys/zfs_vnops.h b/include/sys/zfs_vnops.h index c86fec18d..f2f4d13f4 100644 --- a/include/sys/zfs_vnops.h +++ b/include/sys/zfs_vnops.h @@ -63,7 +63,6 @@ extern int zfs_rename(struct inode *sdip, char *snm, struct inode *tdip, char *tnm, cred_t *cr, int flags); extern int zfs_symlink(struct inode *dip, char *name, vattr_t *vap, char *link, struct inode **ipp, cred_t *cr, int flags); -extern int zfs_follow_link(struct dentry *dentry, struct nameidata *nd); extern int zfs_readlink(struct inode *ip, uio_t *uio, cred_t *cr); extern int zfs_link(struct inode *tdip, struct inode *sip, char *name, cred_t *cr, int flags); |