mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-17 10:26:15 +00:00
Code Issues Releases Activity

White space fixes.

Browse Source
This commit is contained in:
Pawel Jakub Dawidek 2007-05-01 13:32:22 +00:00
parent 1d776018d4
commit 80ae748326
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=169170
8 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
View File

@ -65,7 +65,7 @@ dump_bytes(struct backuparg *ba, void *buf, int len)
auio.uio_iov = &aiov;
auio.uio_iovcnt = 1;
auio.uio_resid = len;
auio.uio_segflg = UIO_SYSSPACE;
auio.uio_segflg = UIO_SYSSPACE;
auio.uio_rw = UIO_WRITE;
auio.uio_offset = (off_t)-1;
auio.uio_td = ba->td;
@ -473,7 +473,7 @@ restore_bytes(struct restorearg *ra, void *buf, int len, off_t off, int *resid)
auio.uio_iov = &aiov;
auio.uio_iovcnt = 1;
auio.uio_resid = len;
auio.uio_segflg = UIO_SYSSPACE;
auio.uio_segflg = UIO_SYSSPACE;
auio.uio_rw = UIO_READ;
auio.uio_offset = off;
auio.uio_td = ra->td;

36
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
View File

@ -605,30 +605,30 @@ zfsctl_snapdir_rename(vnode_t *sdvp, char *snm, vnode_t *tdvp, char *tnm,
static int
zfsctl_snapdir_remove(vnode_t *dvp, char *name, vnode_t *cwd, cred_t *cr)
{
zfsctl_snapdir_t *sdp = dvp->v_data;
char snapname[MAXNAMELEN];
int err;
zfsctl_snapdir_t *sdp = dvp->v_data;
char snapname[MAXNAMELEN];
int err;
err = zfsctl_snapshot_zname(dvp, name, MAXNAMELEN, snapname);
if (err)
return (err);
err = zfs_secpolicy_write(snapname, cr);
if (err)
return (err);
err = zfsctl_snapshot_zname(dvp, name, MAXNAMELEN, snapname);
if (err)
return (err);
err = zfs_secpolicy_write(snapname, cr);
if (err)
return (err);
mutex_enter(&sdp->sd_lock);
mutex_enter(&sdp->sd_lock);
err = zfsctl_unmount_snap(dvp, name, 0, cr);
if (err) {
mutex_exit(&sdp->sd_lock);
return (err);
}
err = zfsctl_unmount_snap(dvp, name, 0, cr);
if (err) {
mutex_exit(&sdp->sd_lock);
return (err);
}
err = dmu_objset_destroy(snapname);
err = dmu_objset_destroy(snapname);
mutex_exit(&sdp->sd_lock);
mutex_exit(&sdp->sd_lock);
return (err);
return (err);
}
#endif

4
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
View File

@ -598,7 +598,7 @@ zfs_mount(vfs_t *vfsp, kthread_t *td)
static int
zfs_statfs(vfs_t *vfsp, struct statfs *statp, kthread_t *td)
{
{
zfsvfs_t *zfsvfs = vfsp->vfs_data;
uint64_t refdbytes, availbytes, usedobjs, availobjs;
@ -691,7 +691,7 @@ zfs_umount(vfs_t *vfsp, int fflag, kthread_t *td)
* Unmount any snapshots mounted under .zfs before unmounting the
* dataset itself.
*/
if (zfsvfs->z_ctldir != NULL) {
if (zfsvfs->z_ctldir != NULL) {
if ((ret = zfsctl_umount_snapshots(vfsp, fflag, cr)) != 0)
return (ret);
ret = vflush(vfsp, 0, 0, td);

24
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
View File

@ -1008,7 +1008,7 @@ zfs_access(vnode_t *vp, int mode, int flags, cred_t *cr)
/* ARGSUSED */
static int
zfs_lookup(vnode_t *dvp, char *nm, vnode_t **vpp, struct componentname *cnp,
int nameiop, cred_t *cr, kthread_t *td)
int nameiop, cred_t *cr, kthread_t *td)
{
znode_t *zdp = VTOZ(dvp);
@ -1120,9 +1120,9 @@ zfs_lookup(vnode_t *dvp, char *nm, vnode_t **vpp, struct componentname *cnp,
*/
if (error == ENOENT && (cnp->cn_flags & MAKEENTRY) && nameiop != CREATE)
cache_enter(dvp, *vpp, cnp);
/*
* Insert name into cache if appropriate.
*/
/*
* Insert name into cache if appropriate.
*/
if (error == 0 && (cnp->cn_flags & MAKEENTRY)) {
if (!(cnp->cn_flags & ISLASTCN) ||
(nameiop != DELETE && nameiop != RENAME)) {
@ -1803,13 +1803,13 @@ zfs_readdir(vnode_t *vp, uio_t *uio, cred_t *cr, int *eofp, int *ncookies, u_lon
odp = (struct dirent64 *)iovp->iov_base;
}
if (ncookies != NULL) {
if (ncookies != NULL) {
/*
* Minimum entry size is dirent size and 1 byte for a file name.
*/
ncooks = uio->uio_resid / (sizeof(struct dirent) - sizeof(((struct dirent *)NULL)->d_name) + 1);
cooks = malloc(ncooks * sizeof(u_long), M_TEMP, M_WAITOK);
*cookies = cooks;
*cookies = cooks;
*ncookies = ncooks;
}
@ -3434,10 +3434,10 @@ zfs_freebsd_link(ap)
static int
zfs_freebsd_inactive(ap)
struct vop_inactive_args /* {
struct vnode *a_vp;
struct thread *a_td;
} */ *ap;
struct vop_inactive_args /* {
struct vnode *a_vp;
struct thread *a_td;
} */ *ap;
{
vnode_t *vp = ap->a_vp;
@ -3452,7 +3452,7 @@ zfs_freebsd_reclaim(ap)
struct thread *a_td;
} */ *ap;
{
vnode_t *vp = ap->a_vp;
vnode_t *vp = ap->a_vp;
znode_t *zp = VTOZ(vp);
zfsvfs_t *zfsvfs;
int rele = 1;
@ -3573,7 +3573,7 @@ struct vop_vector zfs_vnodeops = {
.vop_fid = zfs_freebsd_fid,
};
struct vop_vector zfs_fifoops = {
struct vop_vector zfs_fifoops = {
.vop_default = &fifo_specops,
.vop_fsync = VOP_PANIC,
.vop_access = zfs_freebsd_access,

4
sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
View File

@ -65,7 +65,7 @@ dump_bytes(struct backuparg *ba, void *buf, int len)
auio.uio_iov = &aiov;
auio.uio_iovcnt = 1;
auio.uio_resid = len;
auio.uio_segflg = UIO_SYSSPACE;
auio.uio_segflg = UIO_SYSSPACE;
auio.uio_rw = UIO_WRITE;
auio.uio_offset = (off_t)-1;
auio.uio_td = ba->td;
@ -473,7 +473,7 @@ restore_bytes(struct restorearg *ra, void *buf, int len, off_t off, int *resid)
auio.uio_iov = &aiov;
auio.uio_iovcnt = 1;
auio.uio_resid = len;
auio.uio_segflg = UIO_SYSSPACE;
auio.uio_segflg = UIO_SYSSPACE;
auio.uio_rw = UIO_READ;
auio.uio_offset = off;
auio.uio_td = ra->td;

36
sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
View File

@ -605,30 +605,30 @@ zfsctl_snapdir_rename(vnode_t *sdvp, char *snm, vnode_t *tdvp, char *tnm,
static int
zfsctl_snapdir_remove(vnode_t *dvp, char *name, vnode_t *cwd, cred_t *cr)
{
zfsctl_snapdir_t *sdp = dvp->v_data;
char snapname[MAXNAMELEN];
int err;
zfsctl_snapdir_t *sdp = dvp->v_data;
char snapname[MAXNAMELEN];
int err;
err = zfsctl_snapshot_zname(dvp, name, MAXNAMELEN, snapname);
if (err)
return (err);
err = zfs_secpolicy_write(snapname, cr);
if (err)
return (err);
err = zfsctl_snapshot_zname(dvp, name, MAXNAMELEN, snapname);
if (err)
return (err);
err = zfs_secpolicy_write(snapname, cr);
if (err)
return (err);
mutex_enter(&sdp->sd_lock);
mutex_enter(&sdp->sd_lock);
err = zfsctl_unmount_snap(dvp, name, 0, cr);
if (err) {
mutex_exit(&sdp->sd_lock);
return (err);
}
err = zfsctl_unmount_snap(dvp, name, 0, cr);
if (err) {
mutex_exit(&sdp->sd_lock);
return (err);
}
err = dmu_objset_destroy(snapname);
err = dmu_objset_destroy(snapname);
mutex_exit(&sdp->sd_lock);
mutex_exit(&sdp->sd_lock);
return (err);
return (err);
}
#endif

4
sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
View File

@ -598,7 +598,7 @@ zfs_mount(vfs_t *vfsp, kthread_t *td)
static int
zfs_statfs(vfs_t *vfsp, struct statfs *statp, kthread_t *td)
{
{
zfsvfs_t *zfsvfs = vfsp->vfs_data;
uint64_t refdbytes, availbytes, usedobjs, availobjs;
@ -691,7 +691,7 @@ zfs_umount(vfs_t *vfsp, int fflag, kthread_t *td)
* Unmount any snapshots mounted under .zfs before unmounting the
* dataset itself.
*/
if (zfsvfs->z_ctldir != NULL) {
if (zfsvfs->z_ctldir != NULL) {
if ((ret = zfsctl_umount_snapshots(vfsp, fflag, cr)) != 0)
return (ret);
ret = vflush(vfsp, 0, 0, td);

24
sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
View File

@ -1008,7 +1008,7 @@ zfs_access(vnode_t *vp, int mode, int flags, cred_t *cr)
/* ARGSUSED */
static int
zfs_lookup(vnode_t *dvp, char *nm, vnode_t **vpp, struct componentname *cnp,
int nameiop, cred_t *cr, kthread_t *td)
int nameiop, cred_t *cr, kthread_t *td)
{
znode_t *zdp = VTOZ(dvp);
@ -1120,9 +1120,9 @@ zfs_lookup(vnode_t *dvp, char *nm, vnode_t **vpp, struct componentname *cnp,
*/
if (error == ENOENT && (cnp->cn_flags & MAKEENTRY) && nameiop != CREATE)
cache_enter(dvp, *vpp, cnp);
/*
* Insert name into cache if appropriate.
*/
/*
* Insert name into cache if appropriate.
*/
if (error == 0 && (cnp->cn_flags & MAKEENTRY)) {
if (!(cnp->cn_flags & ISLASTCN) ||
(nameiop != DELETE && nameiop != RENAME)) {
@ -1803,13 +1803,13 @@ zfs_readdir(vnode_t *vp, uio_t *uio, cred_t *cr, int *eofp, int *ncookies, u_lon
odp = (struct dirent64 *)iovp->iov_base;
}
if (ncookies != NULL) {
if (ncookies != NULL) {
/*
* Minimum entry size is dirent size and 1 byte for a file name.
*/
ncooks = uio->uio_resid / (sizeof(struct dirent) - sizeof(((struct dirent *)NULL)->d_name) + 1);
cooks = malloc(ncooks * sizeof(u_long), M_TEMP, M_WAITOK);
*cookies = cooks;
*cookies = cooks;
*ncookies = ncooks;
}
@ -3434,10 +3434,10 @@ zfs_freebsd_link(ap)
static int
zfs_freebsd_inactive(ap)
struct vop_inactive_args /* {
struct vnode *a_vp;
struct thread *a_td;
} */ *ap;
struct vop_inactive_args /* {
struct vnode *a_vp;
struct thread *a_td;
} */ *ap;
{
vnode_t *vp = ap->a_vp;
@ -3452,7 +3452,7 @@ zfs_freebsd_reclaim(ap)
struct thread *a_td;
} */ *ap;
{
vnode_t *vp = ap->a_vp;
vnode_t *vp = ap->a_vp;
znode_t *zp = VTOZ(vp);
zfsvfs_t *zfsvfs;
int rele = 1;
@ -3573,7 +3573,7 @@ struct vop_vector zfs_vnodeops = {
.vop_fid = zfs_freebsd_fid,
};
struct vop_vector zfs_fifoops = {
struct vop_vector zfs_fifoops = {
.vop_default = &fifo_specops,
.vop_fsync = VOP_PANIC,
.vop_access = zfs_freebsd_access,