diff options
author | Robert Watson <rwatson@FreeBSD.org> | 2000-08-26 22:00:58 +0000 |
---|---|---|
committer | Robert Watson <rwatson@FreeBSD.org> | 2000-08-26 22:00:58 +0000 |
commit | 877dd71fc6268236cb4ebc030f2c660d42a4de75 (patch) | |
tree | bf688477cacc0a88589a687c1dcbd3e59ccc1aaf | |
parent | 749e1537ecf2d60c0d33975e913e05816580e5ec (diff) | |
download | src-877dd71fc6268236cb4ebc030f2c660d42a4de75.tar.gz src-877dd71fc6268236cb4ebc030f2c660d42a4de75.zip |
o Correct spelling of ufs_exttatr_find_attr -> ufs_extattr_find_attr
o Add "const" qualifier to attrname argument of various calls to remove
warnings
Obtained from: TrustedBSD Project
Notes
Notes:
svn path=/head/; revision=65119
-rw-r--r-- | sys/kern/vnode_if.src | 4 | ||||
-rw-r--r-- | sys/ufs/ufs/extattr.h | 2 | ||||
-rw-r--r-- | sys/ufs/ufs/ufs_extattr.c | 42 |
3 files changed, 24 insertions, 24 deletions
diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src index 866abfbc309c..9ccba547acc3 100644 --- a/sys/kern/vnode_if.src +++ b/sys/kern/vnode_if.src @@ -539,7 +539,7 @@ vop_aclcheck { # vop_getextattr { IN struct vnode *vp; - IN char *name; + IN const char *name; INOUT struct uio *uio; IN struct ucred *cred; IN struct proc *p; @@ -550,7 +550,7 @@ vop_getextattr { # vop_setextattr { IN struct vnode *vp; - IN char *name; + IN const char *name; INOUT struct uio *uio; IN struct ucred *cred; IN struct proc *p; diff --git a/sys/ufs/ufs/extattr.h b/sys/ufs/ufs/extattr.h index 0ca7c79c5671..f6a975ea5ee5 100644 --- a/sys/ufs/ufs/extattr.h +++ b/sys/ufs/ufs/extattr.h @@ -93,7 +93,7 @@ struct ufs_extattr_per_mount { void ufs_extattr_uepm_init(struct ufs_extattr_per_mount *uepm); int ufs_extattr_start(struct mount *mp, struct proc *p); int ufs_extattr_stop(struct mount *mp, struct proc *p); -int ufs_extattrctl(struct mount *mp, int cmd, char *attrname, +int ufs_extattrctl(struct mount *mp, int cmd, const char *attrname, caddr_t arg, struct proc *p); int ufs_vop_getextattr(struct vop_getextattr_args *ap); int ufs_vop_setextattr(struct vop_setextattr_args *ap); diff --git a/sys/ufs/ufs/ufs_extattr.c b/sys/ufs/ufs/ufs_extattr.c index 13dc80307879..84932be64fc3 100644 --- a/sys/ufs/ufs/ufs_extattr.c +++ b/sys/ufs/ufs/ufs_extattr.c @@ -51,15 +51,15 @@ static MALLOC_DEFINE(M_UFS_EXTATTR, "ufs_extattr", "ufs extended attribute"); static int ufs_extattr_credcheck(struct ufs_extattr_list_entry *uele, u_int32_t fowner, struct ucred *cred, struct proc *p, int access); -static int ufs_extattr_enable(struct ufsmount *ump, char *attrname, +static int ufs_extattr_enable(struct ufsmount *ump, const char *attrname, struct vnode *backing_vnode, struct proc *p); -static int ufs_extattr_disable(struct ufsmount *ump, char *attrname, +static int ufs_extattr_disable(struct ufsmount *ump, const char *attrname, struct proc *p); -static int ufs_extattr_get(struct vnode *vp, char *name, struct uio *uio, - struct ucred *cred, struct proc *p); -static int ufs_extattr_set(struct vnode *vp, char *name, struct uio *uio, - struct ucred *cred, struct proc *p); -static int ufs_extattr_rm(struct vnode *vp, char *name, +static int ufs_extattr_get(struct vnode *vp, const char *name, + struct uio *uio, struct ucred *cred, struct proc *p); +static int ufs_extattr_set(struct vnode *vp, const char *name, + struct uio *uio, struct ucred *cred, struct proc *p); +static int ufs_extattr_rm(struct vnode *vp, const char *name, struct ucred *cred, struct proc *p); /* @@ -88,7 +88,7 @@ ufs_extattr_uepm_unlock(struct ufsmount *ump, struct proc *p) * Must be holding uepm lock for the mount point. */ static struct ufs_extattr_list_entry * -ufs_exttatr_find_attr(struct ufsmount *ump, char *attrname) +ufs_extattr_find_attr(struct ufsmount *ump, const char *attrname) { struct ufs_extattr_list_entry *search_attribute; @@ -191,7 +191,7 @@ unlock: * backing vnode to hold the attribute data. */ static int -ufs_extattr_enable(struct ufsmount *ump, char *attrname, +ufs_extattr_enable(struct ufsmount *ump, const char *attrname, struct vnode *backing_vnode, struct proc *p) { struct ufs_extattr_list_entry *attribute; @@ -212,7 +212,7 @@ ufs_extattr_enable(struct ufsmount *ump, char *attrname, goto free_exit; } - if (ufs_exttatr_find_attr(ump, attrname)) { + if (ufs_extattr_find_attr(ump, attrname)) { error = EOPNOTSUPP; goto free_exit; } @@ -275,12 +275,12 @@ free_exit: * Disable extended attribute support on an FS */ static int -ufs_extattr_disable(struct ufsmount *ump, char *attrname, struct proc *p) +ufs_extattr_disable(struct ufsmount *ump, const char *attrname, struct proc *p) { struct ufs_extattr_list_entry *uele; int error = 0; - uele = ufs_exttatr_find_attr(ump, attrname); + uele = ufs_extattr_find_attr(ump, attrname); if (!uele) return (ENOENT); @@ -299,7 +299,7 @@ ufs_extattr_disable(struct ufsmount *ump, char *attrname, struct proc *p) * attrname, arg are userspace pointers from the syscall */ int -ufs_extattrctl(struct mount *mp, int cmd, char *attrname, +ufs_extattrctl(struct mount *mp, int cmd, const char *attrname, caddr_t arg, struct proc *p) { struct nameidata nd; @@ -408,7 +408,7 @@ ufs_vop_getextattr(struct vop_getextattr_args *ap) /* vop_getextattr { IN struct vnode *a_vp; - IN char *a_name; + IN const char *a_name; INOUT struct uio *a_uio; IN struct ucred *a_cred; IN struct proc *a_p; @@ -434,7 +434,7 @@ vop_getextattr { * the attribute lock has already been grabbed. */ static int -ufs_extattr_get(struct vnode *vp, char *name, struct uio *uio, +ufs_extattr_get(struct vnode *vp, const char *name, struct uio *uio, struct ucred *cred, struct proc *p) { struct ufs_extattr_list_entry *attribute; @@ -451,7 +451,7 @@ ufs_extattr_get(struct vnode *vp, char *name, struct uio *uio, if (!(ump->um_extattr.uepm_flags & UFS_EXTATTR_UEPM_STARTED)) return (EOPNOTSUPP); - attribute = ufs_exttatr_find_attr(ump, name); + attribute = ufs_extattr_find_attr(ump, name); if (!attribute) return (ENOENT); @@ -566,7 +566,7 @@ ufs_vop_setextattr(struct vop_setextattr_args *ap) /* vop_setextattr { IN struct vnode *a_vp; - IN char *a_name; + IN const char *a_name; INOUT struct uio *a_uio; IN struct ucred *a_cred; IN struct proc *a_p; @@ -597,7 +597,7 @@ vop_setextattr { * assumes that the attribute lock has already been grabbed. */ static int -ufs_extattr_set(struct vnode *vp, char *name, struct uio *uio, +ufs_extattr_set(struct vnode *vp, const char *name, struct uio *uio, struct ucred *cred, struct proc *p) { struct ufs_extattr_list_entry *attribute; @@ -617,7 +617,7 @@ ufs_extattr_set(struct vnode *vp, char *name, struct uio *uio, if (!(ump->um_extattr.uepm_flags & UFS_EXTATTR_UEPM_STARTED)) return (EOPNOTSUPP); - attribute = ufs_exttatr_find_attr(ump, name); + attribute = ufs_extattr_find_attr(ump, name); if (!attribute) return (ENOENT); @@ -703,7 +703,7 @@ vopunlock_exit: * Assumes the attribute lock has already been grabbed. */ static int -ufs_extattr_rm(struct vnode *vp, char *name, struct ucred *cred, +ufs_extattr_rm(struct vnode *vp, const char *name, struct ucred *cred, struct proc *p) { struct ufs_extattr_list_entry *attribute; @@ -722,7 +722,7 @@ ufs_extattr_rm(struct vnode *vp, char *name, struct ucred *cred, if (!(ump->um_extattr.uepm_flags & UFS_EXTATTR_UEPM_STARTED)) return (EOPNOTSUPP); - attribute = ufs_exttatr_find_attr(ump, name); + attribute = ufs_extattr_find_attr(ump, name); if (!attribute) return (ENOENT); |