svn commit: r237771 - stable/9/sys/boot/zfs
Andriy Gapon
avg at FreeBSD.org
Fri Jun 29 10:31:00 UTC 2012
Author: avg
Date: Fri Jun 29 10:30:59 2012
New Revision: 237771
URL: http://svn.freebsd.org/changeset/base/237771
Log:
MFC r235390: zfs boot code: mark spa_t arguments as const where they are
used as such
Modified:
stable/9/sys/boot/zfs/zfs.c
stable/9/sys/boot/zfs/zfsimpl.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
stable/9/sys/dev/ (props changed)
stable/9/sys/dev/e1000/ (props changed)
stable/9/sys/dev/isp/ (props changed)
stable/9/sys/dev/ixgbe/ (props changed)
stable/9/sys/fs/ (props changed)
stable/9/sys/fs/ntfs/ (props changed)
stable/9/sys/modules/ (props changed)
Modified: stable/9/sys/boot/zfs/zfs.c
==============================================================================
--- stable/9/sys/boot/zfs/zfs.c Fri Jun 29 10:28:46 2012 (r237770)
+++ stable/9/sys/boot/zfs/zfs.c Fri Jun 29 10:30:59 2012 (r237771)
@@ -127,7 +127,7 @@ zfs_close(struct open_file *f)
static int
zfs_read(struct open_file *f, void *start, size_t size, size_t *resid /* out */)
{
- spa_t *spa = ((struct zfsmount *)f->f_devdata)->spa;
+ const spa_t *spa = ((struct zfsmount *)f->f_devdata)->spa;
struct file *fp = (struct file *)f->f_fsdata;
struct stat sb;
size_t n;
@@ -201,7 +201,7 @@ zfs_seek(struct open_file *f, off_t offs
static int
zfs_stat(struct open_file *f, struct stat *sb)
{
- spa_t *spa = ((struct zfsmount *)f->f_devdata)->spa;
+ const spa_t *spa = ((struct zfsmount *)f->f_devdata)->spa;
struct file *fp = (struct file *)f->f_fsdata;
return (zfs_dnode_stat(spa, &fp->f_dnode, sb));
@@ -210,7 +210,7 @@ zfs_stat(struct open_file *f, struct sta
static int
zfs_readdir(struct open_file *f, struct dirent *d)
{
- spa_t *spa = ((struct zfsmount *)f->f_devdata)->spa;
+ const spa_t *spa = ((struct zfsmount *)f->f_devdata)->spa;
struct file *fp = (struct file *)f->f_fsdata;
mzap_ent_phys_t mze;
struct stat sb;
Modified: stable/9/sys/boot/zfs/zfsimpl.c
==============================================================================
--- stable/9/sys/boot/zfs/zfsimpl.c Fri Jun 29 10:28:46 2012 (r237770)
+++ stable/9/sys/boot/zfs/zfsimpl.c Fri Jun 29 10:30:59 2012 (r237771)
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
struct zfsmount {
- spa_t *spa;
+ const spa_t *spa;
objset_phys_t objset;
uint64_t rootobj;
};
@@ -63,7 +63,7 @@ static char *zfs_temp_buf, *zfs_temp_end
#define TEMP_SIZE (1024 * 1024)
-static int zio_read(spa_t *spa, const blkptr_t *bp, void *buf);
+static int zio_read(const spa_t *spa, const blkptr_t *bp, void *buf);
static void
zfs_init(void)
@@ -981,7 +981,7 @@ ilog2(int n)
}
static int
-zio_read_gang(spa_t *spa, const blkptr_t *bp, void *buf)
+zio_read_gang(const spa_t *spa, const blkptr_t *bp, void *buf)
{
blkptr_t gbh_bp;
zio_gbh_phys_t zio_gb;
@@ -1018,7 +1018,7 @@ zio_read_gang(spa_t *spa, const blkptr_t
}
static int
-zio_read(spa_t *spa, const blkptr_t *bp, void *buf)
+zio_read(const spa_t *spa, const blkptr_t *bp, void *buf)
{
int cpfunc = BP_GET_COMPRESS(bp);
uint64_t align, size;
@@ -1078,7 +1078,7 @@ zio_read(spa_t *spa, const blkptr_t *bp,
}
static int
-dnode_read(spa_t *spa, const dnode_phys_t *dnode, off_t offset, void *buf, size_t buflen)
+dnode_read(const spa_t *spa, const dnode_phys_t *dnode, off_t offset, void *buf, size_t buflen)
{
int ibshift = dnode->dn_indblkshift - SPA_BLKPTRSHIFT;
int bsize = dnode->dn_datablkszsec << SPA_MINBLOCKSHIFT;
@@ -1141,7 +1141,7 @@ dnode_read(spa_t *spa, const dnode_phys_
* scratch buffer contains the directory contents.
*/
static int
-mzap_lookup(spa_t *spa, const dnode_phys_t *dnode, const char *name, uint64_t *value)
+mzap_lookup(const dnode_phys_t *dnode, const char *name, uint64_t *value)
{
const mzap_phys_t *mz;
const mzap_ent_phys_t *mze;
@@ -1222,7 +1222,7 @@ fzap_leaf_value(const zap_leaf_t *zl, co
* buffer contains the directory header.
*/
static int
-fzap_lookup(spa_t *spa, const dnode_phys_t *dnode, const char *name, uint64_t *value)
+fzap_lookup(const spa_t *spa, const dnode_phys_t *dnode, const char *name, uint64_t *value)
{
int bsize = dnode->dn_datablkszsec << SPA_MINBLOCKSHIFT;
zap_phys_t zh = *(zap_phys_t *) zap_scratch;
@@ -1300,7 +1300,7 @@ fzap_lookup(spa_t *spa, const dnode_phys
* Lookup a name in a zap object and return its value as a uint64_t.
*/
static int
-zap_lookup(spa_t *spa, const dnode_phys_t *dnode, const char *name, uint64_t *value)
+zap_lookup(const spa_t *spa, const dnode_phys_t *dnode, const char *name, uint64_t *value)
{
int rc;
uint64_t zap_type;
@@ -1312,7 +1312,7 @@ zap_lookup(spa_t *spa, const dnode_phys_
zap_type = *(uint64_t *) zap_scratch;
if (zap_type == ZBT_MICRO)
- return mzap_lookup(spa, dnode, name, value);
+ return mzap_lookup(dnode, name, value);
else if (zap_type == ZBT_HEADER)
return fzap_lookup(spa, dnode, name, value);
printf("ZFS: invalid zap_type=%d\n", (int)zap_type);
@@ -1326,7 +1326,7 @@ zap_lookup(spa_t *spa, const dnode_phys_
* the directory contents.
*/
static int
-mzap_list(spa_t *spa, const dnode_phys_t *dnode)
+mzap_list(const dnode_phys_t *dnode)
{
const mzap_phys_t *mz;
const mzap_ent_phys_t *mze;
@@ -1356,7 +1356,7 @@ mzap_list(spa_t *spa, const dnode_phys_t
* the directory header.
*/
static int
-fzap_list(spa_t *spa, const dnode_phys_t *dnode)
+fzap_list(const spa_t *spa, const dnode_phys_t *dnode)
{
int bsize = dnode->dn_datablkszsec << SPA_MINBLOCKSHIFT;
zap_phys_t zh = *(zap_phys_t *) zap_scratch;
@@ -1395,7 +1395,7 @@ fzap_list(spa_t *spa, const dnode_phys_t
namelen = zc->l_entry.le_name_length;
if (namelen > sizeof(name))
namelen = sizeof(name);
-
+
/*
* Paste the name back together.
*/
@@ -1429,7 +1429,7 @@ fzap_list(spa_t *spa, const dnode_phys_t
* List a zap directory.
*/
static int
-zap_list(spa_t *spa, const dnode_phys_t *dnode)
+zap_list(const spa_t *spa, const dnode_phys_t *dnode)
{
uint64_t zap_type;
size_t size = dnode->dn_datablkszsec * 512;
@@ -1439,7 +1439,7 @@ zap_list(spa_t *spa, const dnode_phys_t
zap_type = *(uint64_t *) zap_scratch;
if (zap_type == ZBT_MICRO)
- return mzap_list(spa, dnode);
+ return mzap_list(dnode);
else
return fzap_list(spa, dnode);
}
@@ -1447,7 +1447,7 @@ zap_list(spa_t *spa, const dnode_phys_t
#endif
static int
-objset_get_dnode(spa_t *spa, const objset_phys_t *os, uint64_t objnum, dnode_phys_t *dnode)
+objset_get_dnode(const spa_t *spa, const objset_phys_t *os, uint64_t objnum, dnode_phys_t *dnode)
{
off_t offset;
@@ -1457,7 +1457,7 @@ objset_get_dnode(spa_t *spa, const objse
}
static int
-mzap_rlookup(spa_t *spa, const dnode_phys_t *dnode, char *name, uint64_t value)
+mzap_rlookup(const spa_t *spa, const dnode_phys_t *dnode, char *name, uint64_t value)
{
const mzap_phys_t *mz;
const mzap_ent_phys_t *mze;
@@ -1510,7 +1510,7 @@ fzap_name_copy(const zap_leaf_t *zl, con
}
static int
-fzap_rlookup(spa_t *spa, const dnode_phys_t *dnode, char *name, uint64_t value)
+fzap_rlookup(const spa_t *spa, const dnode_phys_t *dnode, char *name, uint64_t value)
{
int bsize = dnode->dn_datablkszsec << SPA_MINBLOCKSHIFT;
zap_phys_t zh = *(zap_phys_t *) zap_scratch;
@@ -1585,7 +1585,7 @@ fzap_rlookup(spa_t *spa, const dnode_phy
}
static int
-zap_rlookup(spa_t *spa, const dnode_phys_t *dnode, char *name, uint64_t value)
+zap_rlookup(const spa_t *spa, const dnode_phys_t *dnode, char *name, uint64_t value)
{
int rc;
uint64_t zap_type;
@@ -1603,7 +1603,7 @@ zap_rlookup(spa_t *spa, const dnode_phys
}
static int
-zfs_rlookup(spa_t *spa, uint64_t objnum, char *result)
+zfs_rlookup(const spa_t *spa, uint64_t objnum, char *result)
{
char name[256];
char component[256];
@@ -1661,7 +1661,7 @@ zfs_rlookup(spa_t *spa, uint64_t objnum,
}
static int
-zfs_lookup_dataset(spa_t *spa, const char *name, uint64_t *objnum)
+zfs_lookup_dataset(const spa_t *spa, const char *name, uint64_t *objnum)
{
char element[256];
uint64_t dir_obj, child_dir_zapobj;
@@ -1714,7 +1714,7 @@ zfs_lookup_dataset(spa_t *spa, const cha
* and return its details in *objset
*/
static int
-zfs_mount_dataset(spa_t *spa, uint64_t objnum, objset_phys_t *objset)
+zfs_mount_dataset(const spa_t *spa, uint64_t objnum, objset_phys_t *objset)
{
dnode_phys_t dataset;
dsl_dataset_phys_t *ds;
@@ -1739,7 +1739,7 @@ zfs_mount_dataset(spa_t *spa, uint64_t o
* dataset if there is none and return its details in *objset
*/
static int
-zfs_get_root(spa_t *spa, uint64_t *objid)
+zfs_get_root(const spa_t *spa, uint64_t *objid)
{
dnode_phys_t dir, propdir;
uint64_t props, bootfs, root;
@@ -1784,7 +1784,7 @@ zfs_get_root(spa_t *spa, uint64_t *objid
}
static int
-zfs_mount(spa_t *spa, uint64_t rootobj, struct zfsmount *mount)
+zfs_mount(const spa_t *spa, uint64_t rootobj, struct zfsmount *mount)
{
mount->spa = spa;
@@ -1822,7 +1822,7 @@ zfs_spa_init(spa_t *spa)
}
static int
-zfs_dnode_stat(spa_t *spa, dnode_phys_t *dn, struct stat *sb)
+zfs_dnode_stat(const spa_t *spa, dnode_phys_t *dn, struct stat *sb)
{
if (dn->dn_bonustype != DMU_OT_SA) {
@@ -1881,7 +1881,7 @@ zfs_lookup(const struct zfsmount *mount,
{
int rc;
uint64_t objnum, rootnum, parentnum;
- spa_t *spa;
+ const spa_t *spa;
dnode_phys_t dn;
const char *p, *q;
char element[256];
More information about the svn-src-stable-9
mailing list