Author: mjg
Date: Tue Sep 1 21:18:40 2020
New Revision: 365070
URL: https://svnweb.freebsd.org/changeset/base/365070
Log:
fs: clean up empty lines in .c and .h files
Modified:
head/sys/fs/autofs/autofs.c
head/sys/fs/autofs/autofs_vnops.c
head/sys/fs/cd9660/cd9660_node.h
head/sys/fs/cd9660/cd9660_rrip.c
head/sys/fs/cd9660/cd9660_vnops.c
head/sys/fs/cd9660/iso_rrip.h
head/sys/fs/cuse/cuse.c
head/sys/fs/devfs/devfs_devs.c
head/sys/fs/ext2fs/ext2_alloc.c
head/sys/fs/ext2fs/ext2_balloc.c
head/sys/fs/ext2fs/ext2_bmap.c
head/sys/fs/ext2fs/ext2_dinode.h
head/sys/fs/ext2fs/ext2_extattr.c
head/sys/fs/ext2fs/ext2_extattr.h
head/sys/fs/ext2fs/ext2_extents.c
head/sys/fs/ext2fs/ext2_inode_cnv.c
head/sys/fs/ext2fs/ext2_lookup.c
head/sys/fs/ext2fs/ext2_vfsops.c
head/sys/fs/ext2fs/ext2_vnops.c
head/sys/fs/fdescfs/fdesc_vnops.c
head/sys/fs/fifofs/fifo_vnops.c
head/sys/fs/fuse/fuse_internal.c
head/sys/fs/fuse/fuse_internal.h
head/sys/fs/fuse/fuse_io.c
head/sys/fs/fuse/fuse_ipc.c
head/sys/fs/fuse/fuse_kernel.h
head/sys/fs/fuse/fuse_node.c
head/sys/fs/fuse/fuse_vnops.c
head/sys/fs/msdosfs/msdosfs_conv.c
head/sys/fs/msdosfs/msdosfs_fat.c
head/sys/fs/msdosfs/msdosfsmount.h
head/sys/fs/nfs/nfs.h
head/sys/fs/nfs/nfs_commonkrpc.c
head/sys/fs/nfs/nfs_commonport.c
head/sys/fs/nfs/nfs_commonsubs.c
head/sys/fs/nfs/nfs_var.h
head/sys/fs/nfs/nfsdport.h
head/sys/fs/nfs/nfsm_subs.h
head/sys/fs/nfs/nfsproto.h
head/sys/fs/nfs/rpcv2.h
head/sys/fs/nfsclient/nfs_clbio.c
head/sys/fs/nfsclient/nfs_clcomsubs.c
head/sys/fs/nfsclient/nfs_clkdtrace.c
head/sys/fs/nfsclient/nfs_clkrpc.c
head/sys/fs/nfsclient/nfs_clnode.c
head/sys/fs/nfsclient/nfs_clport.c
head/sys/fs/nfsclient/nfs_clrpcops.c
head/sys/fs/nfsclient/nfs_clstate.c
head/sys/fs/nfsclient/nfs_clsubs.c
head/sys/fs/nfsclient/nfs_clvfsops.c
head/sys/fs/nfsclient/nfs_clvnops.c
head/sys/fs/nfsclient/nfs_kdtrace.h
head/sys/fs/nfsserver/nfs_fha_new.c
head/sys/fs/nfsserver/nfs_nfsdcache.c
head/sys/fs/nfsserver/nfs_nfsdkrpc.c
head/sys/fs/nfsserver/nfs_nfsdport.c
head/sys/fs/nfsserver/nfs_nfsdserv.c
head/sys/fs/nfsserver/nfs_nfsdsocket.c
head/sys/fs/nfsserver/nfs_nfsdstate.c
head/sys/fs/nfsserver/nfs_nfsdsubs.c
head/sys/fs/nullfs/null_vnops.c
head/sys/fs/procfs/procfs.c
head/sys/fs/procfs/procfs_rlimit.c
head/sys/fs/smbfs/smbfs.h
head/sys/fs/smbfs/smbfs_io.c
head/sys/fs/smbfs/smbfs_node.c
head/sys/fs/smbfs/smbfs_smb.c
head/sys/fs/smbfs/smbfs_vfsops.c
head/sys/fs/smbfs/smbfs_vnops.c
head/sys/fs/tmpfs/tmpfs_subr.c
head/sys/fs/tmpfs/tmpfs_vnops.c
head/sys/fs/udf/udf_vfsops.c
head/sys/fs/udf/udf_vnops.c
head/sys/fs/unionfs/union_vfsops.c
Modified: head/sys/fs/autofs/autofs.c
==============================================================================
--- head/sys/fs/autofs/autofs.c Tue Sep 1 21:18:06 2020 (r365069)
+++ head/sys/fs/autofs/autofs.c Tue Sep 1 21:18:40 2020 (r365070)
@@ -535,7 +535,6 @@ autofs_trigger(struct autofs_node *anp,
"error %d", anp->an_retries, error);
anp->an_retries = 0;
return (error);
-
}
AUTOFS_DEBUG("trigger failed with error %d; will retry in "
"%d seconds, %d attempts left", error, autofs_retry_delay,
Modified: head/sys/fs/autofs/autofs_vnops.c
==============================================================================
--- head/sys/fs/autofs/autofs_vnops.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/autofs/autofs_vnops.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -204,7 +204,6 @@ autofs_vget_callback(struct mount *mp, void *arg, int
struct vnode **vpp)
{
-
return (autofs_node_vn(arg, mp, flags, vpp));
}
Modified: head/sys/fs/cd9660/cd9660_node.h
==============================================================================
--- head/sys/fs/cd9660/cd9660_node.h Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/cd9660/cd9660_node.h Tue Sep 1 21:18:40 2020
(r365070)
@@ -57,7 +57,6 @@ typedef struct {
dev_t iso_rdev; /* Major/Minor number for special */
} ISO_RRIP_INODE;
-
struct iso_node {
struct vnode *i_vnode; /* vnode associated with this inode */
cd_ino_t i_number; /* the identity of the inode */
Modified: head/sys/fs/cd9660/cd9660_rrip.c
==============================================================================
--- head/sys/fs/cd9660/cd9660_rrip.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/cd9660/cd9660_rrip.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -135,7 +135,6 @@ cd9660_rrip_slink(p,ana)
pcomp < pcompe;
pcomp = (ISO_RRIP_SLINK_COMPONENT *)((char *)pcomp + ISO_RRIP_SLSIZ
+ isonum_711(pcomp->clen))) {
-
if (!cont) {
if (len < ana->maxlen) {
len++;
@@ -148,7 +147,6 @@ cd9660_rrip_slink(p,ana)
wlen = 0;
switch (*pcomp->cflag) {
-
case ISO_SUSP_CFLAG_CURRENT:
/* Inserting Current */
wlen = 1;
@@ -207,7 +205,6 @@ cd9660_rrip_slink(p,ana)
memcpy(outbuf, inbuf, wlen);
outbuf += wlen;
len += wlen;
-
}
ana->outbuf = outbuf;
*ana->outlen = len;
@@ -391,7 +388,6 @@ cd9660_rrip_tstamp(p,ana)
cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_ctime);
else
ana->inop->inode.iso_ctime = ana->inop->inode.iso_mtime;
-
}
ana->fields &= ~ISO_SUSP_TSTAMP;
return ISO_SUSP_TSTAMP;
Modified: head/sys/fs/cd9660/cd9660_vnops.c
==============================================================================
--- head/sys/fs/cd9660/cd9660_vnops.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/cd9660/cd9660_vnops.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -181,7 +181,6 @@ cd9660_open(ap)
return (0);
}
-
static int
cd9660_getattr(ap)
struct vop_getattr_args /* {
Modified: head/sys/fs/cd9660/iso_rrip.h
==============================================================================
--- head/sys/fs/cd9660/iso_rrip.h Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/cd9660/iso_rrip.h Tue Sep 1 21:18:40 2020
(r365070)
@@ -37,7 +37,6 @@
* $FreeBSD$
*/
-
/*
* Analyze function flag (similar to RR field bits)
*/
Modified: head/sys/fs/cuse/cuse.c
==============================================================================
--- head/sys/fs/cuse/cuse.c Tue Sep 1 21:18:06 2020 (r365069)
+++ head/sys/fs/cuse/cuse.c Tue Sep 1 21:18:40 2020 (r365070)
@@ -274,7 +274,6 @@ cuse_kern_uninit(void *arg)
void *ptr;
while (1) {
-
printf("Cuse: Please exit all /dev/cuse instances "
"and processes which have used this device.\n");
@@ -356,7 +355,6 @@ cuse_str_filter(char *ptr)
int c;
while (((c = *ptr) != 0)) {
-
if ((c >= 'a') && (c <= 'z')) {
ptr++;
continue;
@@ -514,7 +512,6 @@ cuse_client_is_closing(struct cuse_client *pcc)
pcc->server_dev = NULL;
for (n = 0; n != CUSE_CMD_MAX; n++) {
-
pccmd = &pcc->cmds[n];
if (pccmd->entry.tqe_prev != NULL) {
@@ -1068,7 +1065,6 @@ cuse_server_ioctl(struct cdev *dev, unsigned long cmd,
cuse_server_lock(pcs);
while ((pccmd = cuse_server_find_command(pcs, curthread)) !=
NULL) {
-
/* send sync command */
pccmd->entered = NULL;
pccmd->error = *(int *)data;
@@ -1373,7 +1369,6 @@ cuse_client_free(void *arg)
cuse_server_unlock(pcs);
for (n = 0; n != CUSE_CMD_MAX; n++) {
-
pccmd = &pcc->cmds[n];
sx_destroy(&pccmd->sx);
@@ -1434,7 +1429,6 @@ cuse_client_open(struct cdev *dev, int fflags, int dev
pcc->server = pcs;
for (n = 0; n != CUSE_CMD_MAX; n++) {
-
pccmd = &pcc->cmds[n];
pccmd->sub.dev = pcd;
@@ -1572,7 +1566,6 @@ cuse_client_read(struct cdev *dev, struct uio *uio, in
cuse_cmd_lock(pccmd);
while (uio->uio_resid != 0) {
-
if (uio->uio_iov->iov_len > CUSE_LENGTH_MAX) {
error = ENOMEM;
break;
@@ -1633,7 +1626,6 @@ cuse_client_write(struct cdev *dev, struct uio *uio, i
cuse_cmd_lock(pccmd);
while (uio->uio_resid != 0) {
-
if (uio->uio_iov->iov_len > CUSE_LENGTH_MAX) {
error = ENOMEM;
break;
Modified: head/sys/fs/devfs/devfs_devs.c
==============================================================================
--- head/sys/fs/devfs/devfs_devs.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/devfs/devfs_devs.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -58,7 +58,6 @@ struct cdev_priv_list cdevp_list = TAILQ_HEAD_INITIALI
struct unrhdr *devfs_inos;
-
static MALLOC_DEFINE(M_DEVFS2, "DEVFS2", "DEVFS data 2");
static MALLOC_DEFINE(M_DEVFS3, "DEVFS3", "DEVFS data 3");
static MALLOC_DEFINE(M_CDEVP, "DEVFS1", "DEVFS cdev_priv storage");
@@ -523,7 +522,6 @@ devfs_populate_loop(struct devfs_mount *dm, int cleanu
sx_assert(&dm->dm_lock, SX_XLOCKED);
dev_lock();
TAILQ_FOREACH(cdp, &cdevp_list, cdp_list) {
-
KASSERT(cdp->cdp_dirents != NULL, ("NULL cdp_dirents"));
/*
@@ -575,7 +573,6 @@ devfs_populate_loop(struct devfs_mount *dm, int cleanu
continue;
}
-
cdp->cdp_inuse++;
dev_unlock();
@@ -604,7 +601,6 @@ devfs_populate_loop(struct devfs_mount *dm, int cleanu
(dd->de_flags & (DE_DOT | DE_DOTDOT)) == 0,
("%s: invalid directory (si_name=%s)",
__func__, cdp->cdp_c.si_name));
-
}
de_flags = 0;
de = devfs_find(dd, s, q - s, DT_LNK);
Modified: head/sys/fs/ext2fs/ext2_alloc.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_alloc.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/ext2fs/ext2_alloc.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -468,7 +468,6 @@ ext2_valloc(struct vnode *pvp, int mode, struct ucred
else
memset(ip->i_data, 0, sizeof(ip->i_data));
-
/*
* Set up a new generation number for this inode.
* Avoid zero values.
@@ -1300,7 +1299,6 @@ ext2_fix_bitmap_tail(unsigned char *bitmap, int first,
for (i = first; i <= last; i++)
bitmap[i] = 0xff;
}
-
/*
* Determine whether an inode can be allocated.
Modified: head/sys/fs/ext2fs/ext2_balloc.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_balloc.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/ext2fs/ext2_balloc.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -83,7 +83,6 @@ ext2_ext_balloc(struct inode *ip, uint32_t lbn, int si
}
}
-
bp->b_blkno = fsbtodb(fs, newblk);
if (flags & BA_CLRBUF)
vfs_bio_clrbuf(bp);
Modified: head/sys/fs/ext2fs/ext2_bmap.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_bmap.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/ext2fs/ext2_bmap.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -236,7 +236,6 @@ ext2_bmaparray(struct vnode *vp, daddr_t bn, daddr_t *
if (runb)
*runb = 0;
-
ap = a;
nump = #
error = ext2_getlbns(vp, bn, ap, nump);
Modified: head/sys/fs/ext2fs/ext2_dinode.h
==============================================================================
--- head/sys/fs/ext2fs/ext2_dinode.h Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/ext2fs/ext2_dinode.h Tue Sep 1 21:18:40 2020
(r365070)
@@ -140,4 +140,3 @@ struct ext2fs_dinode {
};
#endif /* !_FS_EXT2FS_EXT2_DINODE_H_ */
-
Modified: head/sys/fs/ext2fs/ext2_extattr.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_extattr.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/ext2fs/ext2_extattr.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -581,7 +581,6 @@ ext2_extattr_inode_delete(struct inode *ip, int attrna
if ((EXT2_IS_LAST_ENTRY(EXT2_EXTATTR_NEXT(entry))) &&
(ext2_extattr_attrnamespace_to_bsd(entry->e_name_index) ==
attrnamespace)) {
-
name_len = entry->e_name_len;
attr_name = ext2_extattr_name_to_bsd(entry->e_name_index,
entry->e_name, &name_len);
@@ -715,7 +714,6 @@ ext2_extattr_block_delete(struct inode *ip, int attrna
if (EXT2_IS_LAST_ENTRY(EXT2_EXTATTR_NEXT(entry)) &&
(ext2_extattr_attrnamespace_to_bsd(entry->e_name_index) ==
attrnamespace)) {
-
name_len = entry->e_name_len;
attr_name = ext2_extattr_name_to_bsd(entry->e_name_index,
entry->e_name, &name_len);
Modified: head/sys/fs/ext2fs/ext2_extattr.h
==============================================================================
--- head/sys/fs/ext2fs/ext2_extattr.h Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/ext2fs/ext2_extattr.h Tue Sep 1 21:18:40 2020
(r365070)
@@ -53,7 +53,6 @@
#define EXT2_EXTATTR_VALUE_HASH_SHIFT 16
#define EXT2_EXTATTR_BLOCK_HASH_SHIFT 16
-
struct ext2fs_extattr_header {
int32_t h_magic; /* magic number for identification */
int32_t h_refcount; /* reference count */
Modified: head/sys/fs/ext2fs/ext2_extents.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_extents.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/ext2fs/ext2_extents.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -192,7 +192,6 @@ ext4_index_store_pblock(struct ext4_extent_index *inde
index->ei_leaf_hi = htole16((pb >> 32) & 0xffff);
}
-
static inline e4fs_daddr_t
ext4_ext_extent_pblock(struct ext4_extent *extent)
{
Modified: head/sys/fs/ext2fs/ext2_inode_cnv.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_inode_cnv.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/ext2fs/ext2_inode_cnv.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -94,7 +94,6 @@ ext2_print_inode(struct inode *in)
}
#endif /* EXT2FS_PRINT_EXTENTS */
-
#define XTIME_TO_NSEC(x) ((le32toh(x) & EXT3_NSEC_MASK) >> 2)
/*
Modified: head/sys/fs/ext2fs/ext2_lookup.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_lookup.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/ext2fs/ext2_lookup.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -944,7 +944,6 @@ ext2_direnter(struct inode *ip, struct vnode *dvp, str
int DIRBLKSIZ = ip->i_e2fs->e2fs_bsize;
int error;
-
#ifdef INVARIANTS
if ((cnp->cn_flags & SAVENAME) == 0)
panic("ext2_direnter: missing name");
Modified: head/sys/fs/ext2fs/ext2_vfsops.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_vfsops.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/ext2fs/ext2_vfsops.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -78,7 +78,6 @@ SDT_PROBE_DEFINE2(ext2fs, , vfsops, trace, "int", "cha
SDT_PROBE_DEFINE2(ext2fs, , vfsops, ext2_cg_validate_error, "char*", "int");
SDT_PROBE_DEFINE1(ext2fs, , vfsops, ext2_compute_sb_data_error, "char*");
-
static int ext2_flushfiles(struct mount *mp, int flags, struct thread *td);
static int ext2_mountfs(struct vnode *, struct mount *);
static int ext2_reload(struct mount *mp, struct thread *td);
@@ -398,7 +397,6 @@ ext2_cg_validate(struct m_ext2fs *fs)
SDT_PROBE2(ext2fs, , vfsops, ext2_cg_validate_error,
"block bitmap is zero", i);
return (EINVAL);
-
}
if (b_bitmap <= last_cg_block) {
SDT_PROBE2(ext2fs, , vfsops, ext2_cg_validate_error,
Modified: head/sys/fs/ext2fs/ext2_vnops.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_vnops.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/ext2fs/ext2_vnops.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -1572,7 +1572,6 @@ ext2_strategy(struct vop_strategy_args *ap)
if (vp->v_type == VBLK || vp->v_type == VCHR)
panic("ext2_strategy: spec");
if (bp->b_blkno == bp->b_lblkno) {
-
if (VTOI(ap->a_vp)->i_flag & IN_E4EXTENTS)
error = ext4_bmapext(vp, bp->b_lblkno, &blkno, NULL,
NULL);
else
Modified: head/sys/fs/fdescfs/fdesc_vnops.c
==============================================================================
--- head/sys/fs/fdescfs/fdesc_vnops.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/fdescfs/fdesc_vnops.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -272,7 +272,6 @@ fdesc_get_ino_alloc(struct mount *mp, void *arg, int l
return (error);
}
-
/*
* vp is the current namei directory
* ndp is the name to locate in that directory...
Modified: head/sys/fs/fifofs/fifo_vnops.c
==============================================================================
--- head/sys/fs/fifofs/fifo_vnops.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/fifofs/fifo_vnops.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -366,4 +366,3 @@ fifo_advlock(ap)
return (ap->a_flags & F_FLOCK ? EOPNOTSUPP : EINVAL);
}
-
Modified: head/sys/fs/fuse/fuse_internal.c
==============================================================================
--- head/sys/fs/fuse/fuse_internal.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/fuse/fuse_internal.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -312,7 +312,6 @@ fuse_internal_cache_attrs(struct vnode *vp, struct fus
memcpy(vap, vp_cache_at, sizeof(*vap));
}
-
/* fsync */
int
Modified: head/sys/fs/fuse/fuse_internal.h
==============================================================================
--- head/sys/fs/fuse/fuse_internal.h Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/fuse/fuse_internal.h Tue Sep 1 21:18:40 2020
(r365070)
@@ -199,7 +199,6 @@ fuse_validity_2_timespec(const struct fuse_entry_out *
}
}
-
/* VFS ops */
int
fuse_internal_get_cached_vnode(struct mount*, ino_t, int, struct vnode**);
Modified: head/sys/fs/fuse/fuse_io.c
==============================================================================
--- head/sys/fs/fuse/fuse_io.c Tue Sep 1 21:18:06 2020 (r365069)
+++ head/sys/fs/fuse/fuse_io.c Tue Sep 1 21:18:40 2020 (r365070)
@@ -1037,7 +1037,6 @@ fuse_io_strategy(struct vnode *vp, struct buf *bp)
"Short read of a dirty file");
uiop->uio_resid = 0;
}
-
}
if (error) {
bp->b_ioflags |= BIO_ERROR;
Modified: head/sys/fs/fuse/fuse_ipc.c
==============================================================================
--- head/sys/fs/fuse/fuse_ipc.c Tue Sep 1 21:18:06 2020 (r365069)
+++ head/sys/fs/fuse/fuse_ipc.c Tue Sep 1 21:18:40 2020 (r365070)
@@ -285,7 +285,6 @@ fiov_adjust(struct fuse_iov *fiov, size_t size)
(fuse_iov_permanent_bufsize >= 0 &&
fiov->allocated_size - size > fuse_iov_permanent_bufsize &&
--fiov->credit < 0)) {
-
fiov->base = realloc(fiov->base, FU_AT_LEAST(size), M_FUSEMSG,
M_WAITOK | M_ZERO);
if (!fiov->base) {
Modified: head/sys/fs/fuse/fuse_kernel.h
==============================================================================
--- head/sys/fs/fuse/fuse_kernel.h Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/fuse/fuse_kernel.h Tue Sep 1 21:18:40 2020
(r365070)
@@ -106,7 +106,7 @@
#ifndef _FUSE_FUSE_KERNEL_H
#define _FUSE_FUSE_KERNEL_H
-
+
#ifdef __linux__
#include <linux/types.h>
#else
Modified: head/sys/fs/fuse/fuse_node.c
==============================================================================
--- head/sys/fs/fuse/fuse_node.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/fuse/fuse_node.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -440,7 +440,7 @@ out:
vnode_pager_setsize(vp, newsize);
return err;
}
-
+
/* Get the current, possibly dirty, size of the file */
int
fuse_vnode_size(struct vnode *vp, off_t *filesize, struct ucred *cred,
@@ -485,7 +485,7 @@ fuse_vnode_update(struct vnode *vp, int flags)
fvdat->cached_attrs.va_mtime = ts;
if (flags & FN_CTIMECHANGE)
fvdat->cached_attrs.va_ctime = ts;
-
+
fvdat->flag |= flags;
}
Modified: head/sys/fs/fuse/fuse_vnops.c
==============================================================================
--- head/sys/fs/fuse/fuse_vnops.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/fuse/fuse_vnops.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -1232,7 +1232,6 @@ fuse_vnop_lookup(struct vop_lookup_args *ap)
(nameiop == RENAME && wantparent))) {
cnp->cn_flags |= SAVENAME;
}
-
}
}
out:
@@ -1877,7 +1876,6 @@ fuse_vnop_strategy(struct vop_strategy_args *ap)
return 0;
}
-
/*
struct vnop_symlink_args {
struct vnode *a_dvp;
@@ -2120,7 +2118,7 @@ fuse_vnop_setextattr(struct vop_setextattr_args *ap)
size_t len;
char *attr_str;
int err;
-
+
if (fuse_isdeadfs(vp))
return (ENXIO);
@@ -2466,7 +2464,7 @@ fuse_vnop_print(struct vop_print_args *ap)
return 0;
}
-
+
/*
* Get an NFS filehandle for a FUSE file.
*
@@ -2509,5 +2507,3 @@ fuse_vnop_vptofh(struct vop_vptofh_args *ap)
return EOVERFLOW;
return (0);
}
-
-
Modified: head/sys/fs/msdosfs/msdosfs_conv.c
==============================================================================
--- head/sys/fs/msdosfs/msdosfs_conv.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/msdosfs/msdosfs_conv.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -338,7 +338,6 @@ unix2dosfn(const u_char *un, u_char dn[12], size_t unl
if (i < 0)
return 0;
-
/*
* Filenames with some characters are not allowed!
*/
Modified: head/sys/fs/msdosfs/msdosfs_fat.c
==============================================================================
--- head/sys/fs/msdosfs/msdosfs_fat.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/msdosfs/msdosfs_fat.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -816,7 +816,6 @@ clusteralloc1(struct msdosfsmount *pmp, u_long start,
return (chainalloc(pmp, foundcn, foundl, fillwith, retcluster,
got));
}
-
/*
* Free a chain of clusters.
*
Modified: head/sys/fs/msdosfs/msdosfsmount.h
==============================================================================
--- head/sys/fs/msdosfs/msdosfsmount.h Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/msdosfs/msdosfsmount.h Tue Sep 1 21:18:40 2020
(r365070)
@@ -130,7 +130,6 @@ struct msdosfs_fileno {
/* Byte offset in FAT on filesystem pmp, cluster cn */
#define FATOFS(pmp, cn) ((cn) * (pmp)->pm_fatmult / (pmp)->pm_fatdiv)
-
#define VFSTOMSDOSFS(mp) ((struct msdosfsmount *)mp->mnt_data)
/* Number of bits in one pm_inusemap item: */
Modified: head/sys/fs/nfs/nfs.h
==============================================================================
--- head/sys/fs/nfs/nfs.h Tue Sep 1 21:18:06 2020 (r365069)
+++ head/sys/fs/nfs/nfs.h Tue Sep 1 21:18:40 2020 (r365070)
@@ -579,7 +579,6 @@ struct uio; struct buf; struct vattr; struct nameidata
((e) != EINTR && (e) != ERESTART && (e) != EWOULDBLOCK && \
((s) & PR_CONNREQUIRED) == 0)
-
/*
* This structure holds socket information for a connection. Used by the
* client and the server for callbacks.
Modified: head/sys/fs/nfs/nfs_commonkrpc.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonkrpc.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/nfs/nfs_commonkrpc.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -489,7 +489,6 @@ nfs_getauth(struct nfssockreq *nrp, int secflavour, ch
case AUTH_SYS:
default:
return (authunix_create(cred));
-
}
}
@@ -734,7 +733,7 @@ newnfs_request(struct nfsrv_descript *nd, struct nfsmo
if (dtrace_nfscl_nfs234_start_probe != NULL) {
uint32_t probe_id;
int probe_procnum;
-
+
if (nd->nd_flag & ND_NFSV4) {
probe_id =
nfscl_nfs4_start_probes[nd->nd_procnum];
@@ -1257,13 +1256,13 @@ static int
nfs_sig_pending(sigset_t set)
{
int i;
-
+
for (i = 0 ; i < nitems(newnfs_sig_set); i++)
if (SIGISMEMBER(set, newnfs_sig_set[i]))
return (1);
return (0);
}
-
+
/*
* The set/restore sigmask functions are used to (temporarily) overwrite
* the thread td_sigmask during an RPC call (for example). These are also
@@ -1275,7 +1274,7 @@ newnfs_set_sigmask(struct thread *td, sigset_t *oldset
sigset_t newset;
int i;
struct proc *p;
-
+
SIGFILLSET(newset);
if (td == NULL)
td = curthread; /* XXX */
@@ -1337,7 +1336,7 @@ newnfs_sigintr(struct nfsmount *nmp, struct thread *td
{
struct proc *p;
sigset_t tmpset;
-
+
/* Terminate all requests while attempting a forced unmount. */
if (NFSCL_FORCEDISM(nmp->nm_mountp))
return (EIO);
@@ -1420,7 +1419,7 @@ nfs_up(struct nfsmount *nmp, struct thread *td, const
VQ_NOTRESP, 1);
} else
mtx_unlock(&nmp->nm_mtx);
-
+
mtx_lock(&nmp->nm_mtx);
if ((flags & NFSSTA_LOCKTIMEO) && (nmp->nm_state & NFSSTA_LOCKTIMEO)) {
nmp->nm_state &= ~NFSSTA_LOCKTIMEO;
@@ -1430,4 +1429,3 @@ nfs_up(struct nfsmount *nmp, struct thread *td, const
} else
mtx_unlock(&nmp->nm_mtx);
}
-
Modified: head/sys/fs/nfs/nfs_commonport.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonport.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/nfs/nfs_commonport.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -420,7 +420,6 @@ newnfs_timer(void *arg)
callout_reset(&newnfsd_callout, nfscl_ticks, newnfs_timer, NULL);
}
-
/*
* Sleep for a short period of time unless errval == NFSERR_GRACE, where
* the sleep should be for 5 seconds.
@@ -952,4 +951,3 @@ DECLARE_MODULE(nfscommon, nfscommon_mod, SI_SUB_VFS, S
MODULE_VERSION(nfscommon, 1);
MODULE_DEPEND(nfscommon, nfssvc, 1, 1, 1);
MODULE_DEPEND(nfscommon, krpc, 1, 1, 1);
-
Modified: head/sys/fs/nfs/nfs_commonsubs.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonsubs.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/nfs/nfs_commonsubs.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -364,7 +364,7 @@ nfscl_reqstart(struct nfsrv_descript *nd, int procnum,
mb->m_len = 0;
nd->nd_mreq = nd->nd_mb = mb;
nd->nd_bpos = mtod(mb, char *);
-
+
/*
* And fill the first file handle into the request.
*/
@@ -2559,7 +2559,7 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount
xattrsupp = true;
}
}
-
+
/*
* Put out the attribute bitmap for the ones being filled in
* and get the field for the number of attributes returned.
@@ -3272,7 +3272,7 @@ tryagain:
len -= (nfsrv_dnsnamelen + 1);
*(cp - 1) = '\0';
}
-
+
/*
* Check for the special case of "nobody".
*/
@@ -3281,7 +3281,7 @@ tryagain:
error = 0;
goto out;
}
-
+
hp = NFSUSERNAMEHASH(str, len);
mtx_lock(&hp->mtx);
TAILQ_FOREACH(usrp, &hp->lughead, lug_namehash) {
@@ -3484,7 +3484,7 @@ tryagain:
len -= (nfsrv_dnsnamelen + 1);
*(cp - 1) = '\0';
}
-
+
/*
* Check for the special case of "nogroup".
*/
@@ -3493,7 +3493,7 @@ tryagain:
error = 0;
goto out;
}
-
+
hp = NFSGROUPNAMEHASH(str, len);
mtx_lock(&hp->mtx);
TAILQ_FOREACH(usrp, &hp->lughead, lug_namehash) {
Modified: head/sys/fs/nfs/nfs_var.h
==============================================================================
--- head/sys/fs/nfs/nfs_var.h Tue Sep 1 21:18:06 2020 (r365069)
+++ head/sys/fs/nfs/nfs_var.h Tue Sep 1 21:18:40 2020 (r365070)
@@ -776,4 +776,3 @@ void nfsrvd_init(int);
/* nfs_clkrpc.c */
int nfscbd_addsock(struct file *);
int nfscbd_nfsd(NFSPROC_T *, struct nfsd_nfscbd_args *);
-
Modified: head/sys/fs/nfs/nfsdport.h
==============================================================================
--- head/sys/fs/nfs/nfsdport.h Tue Sep 1 21:18:06 2020 (r365069)
+++ head/sys/fs/nfs/nfsdport.h Tue Sep 1 21:18:40 2020 (r365070)
@@ -118,4 +118,3 @@ struct nfsexstuff {
if (nfsd_debuglevel >= (level)) \
printf(__VA_ARGS__); \
} while (0)
-
Modified: head/sys/fs/nfs/nfsm_subs.h
==============================================================================
--- head/sys/fs/nfs/nfsm_subs.h Tue Sep 1 21:18:06 2020 (r365069)
+++ head/sys/fs/nfs/nfsm_subs.h Tue Sep 1 21:18:40 2020 (r365070)
@@ -37,7 +37,6 @@
#ifndef _NFS_NFSM_SUBS_H_
#define _NFS_NFSM_SUBS_H_
-
/*
* These macros do strange and peculiar things to mbuf chains for
* the assistance of the nfs code. To attempt to use them for any
Modified: head/sys/fs/nfs/nfsproto.h
==============================================================================
--- head/sys/fs/nfs/nfsproto.h Tue Sep 1 21:18:06 2020 (r365069)
+++ head/sys/fs/nfs/nfsproto.h Tue Sep 1 21:18:40 2020 (r365070)
@@ -1137,7 +1137,6 @@ struct nfsv3_sattr {
NFSATTRBM_QUOTAUSED | \
NFSATTRBM_FSLAYOUTTYPE)
-
#ifdef QUOTA
/*
* If QUOTA OR in NFSATTRBIT_QUOTAHARD, NFSATTRBIT_QUOTASOFT and
Modified: head/sys/fs/nfs/rpcv2.h
==============================================================================
--- head/sys/fs/nfs/rpcv2.h Tue Sep 1 21:18:06 2020 (r365069)
+++ head/sys/fs/nfs/rpcv2.h Tue Sep 1 21:18:40 2020 (r365070)
@@ -199,7 +199,7 @@
#define RPCMNT_NAMELEN 255
#define RPCMNT_PATHLEN 1024
#define RPCPROG_NFS 100003
-
+
/* Structs for common parts of the rpc's */
struct rpcv2_time {
u_int32_t rpc_sec;
Modified: head/sys/fs/nfsclient/nfs_clbio.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clbio.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/nfsclient/nfs_clbio.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -1890,4 +1890,3 @@ ncl_meta_setsize(struct vnode *vp, struct thread *td,
}
return(error);
}
-
Modified: head/sys/fs/nfsclient/nfs_clcomsubs.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clcomsubs.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/nfsclient/nfs_clcomsubs.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -485,4 +485,3 @@ nfscl_lockderef(struct nfsv4lock *lckp)
}
NFSUNLOCKCLSTATE();
}
-
Modified: head/sys/fs/nfsclient/nfs_clkdtrace.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clkdtrace.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/nfsclient/nfs_clkdtrace.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -540,7 +540,6 @@ dtnfsclient_load(void *dummy)
(dtrace_nfsclient_nfs23_done_probe_func_t)dtrace_probe;
}
-
static int
dtnfsclient_unload()
{
Modified: head/sys/fs/nfsclient/nfs_clkrpc.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clkrpc.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/nfsclient/nfs_clkrpc.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
#include <rpc/rpcsec_gss.h>
#include <rpc/rpcsec_tls.h>
-
NFSDLOCKMUTEX;
extern SVCPOOL *nfscbd_pool;
@@ -308,4 +307,3 @@ nfsrvd_cbinit(int terminating)
NFSD_LOCK();
}
}
-
Modified: head/sys/fs/nfsclient/nfs_clnode.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clnode.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/nfsclient/nfs_clnode.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -164,7 +164,7 @@ ncl_nget(struct mount *mntp, u_int8_t *fhp, int fhsize
}
vp->v_vflag |= VV_VMSIZEVNLOCK;
-
+
np->n_fhp = malloc(sizeof (struct nfsfh) + fhsize,
M_NFSFH, M_WAITOK);
bcopy(fhp, np->n_fhp->nfh_fh, fhsize);
Modified: head/sys/fs/nfsclient/nfs_clport.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clport.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/nfsclient/nfs_clport.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -249,7 +249,7 @@ nfscl_nget(struct mount *mntp, struct vnode *dvp, stru
}
vp->v_vflag |= VV_VMSIZEVNLOCK;
-
+
np->n_fhp = nfhp;
/*
* For NFSv4, we have to attach the directory file handle and
@@ -1046,7 +1046,6 @@ newnfs_copyincred(struct ucred *cr, struct nfscred *nf
nfscr->nfsc_groups[i] = cr->cr_groups[i];
}
-
/*
* Do any client specific initialization.
*/
@@ -1419,4 +1418,3 @@ MODULE_VERSION(nfscl, 1);
MODULE_DEPEND(nfscl, nfscommon, 1, 1, 1);
MODULE_DEPEND(nfscl, krpc, 1, 1, 1);
MODULE_DEPEND(nfscl, nfssvc, 1, 1, 1);
-
Modified: head/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clrpcops.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/nfsclient/nfs_clrpcops.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -231,7 +231,7 @@ nfsrpc_null(vnode_t vp, struct ucred *cred, NFSPROC_T
{
int error;
struct nfsrv_descript nfsd, *nd = &nfsd;
-
+
NFSCL_REQSTART(nd, NFSPROC_NULL, vp);
error = nfscl_request(nd, vp, p, cred, NULL);
if (nd->nd_repstat && !error)
@@ -1191,7 +1191,7 @@ nfsrpc_getattr(vnode_t vp, struct ucred *cred, NFSPROC
struct nfsrv_descript nfsd, *nd = &nfsd;
int error;
nfsattrbit_t attrbits;
-
+
NFSCL_REQSTART(nd, NFSPROC_GETATTR, vp);
if (nd->nd_flag & ND_NFSV4) {
NFSGETATTR_ATTRBIT(&attrbits);
@@ -1219,7 +1219,7 @@ nfsrpc_getattrnovp(struct nfsmount *nmp, u_int8_t *fhp
struct nfsrv_descript nfsd, *nd = &nfsd;
int error, vers = NFS_VER2;
nfsattrbit_t attrbits;
-
+
nfscl_reqstart(nd, NFSPROC_GETATTR, nmp, fhp, fhlen, NULL, NULL, 0, 0);
if (nd->nd_flag & ND_NFSV4) {
vers = NFS_VER4;
@@ -1837,7 +1837,6 @@ nfsrpc_writerpc(vnode_t vp, struct uio *uiop, int *iom
x = txdr_unsigned(len);
*tl++ = x; /* total to this offset */
*tl = x; /* size of this write */
-
}
nfsm_uiombuf(nd, uiop, len);
/*
@@ -2497,7 +2496,7 @@ nfsrpc_rename(vnode_t fdvp, vnode_t fvp, char *fnamept
nfsattrbit_t attrbits;
nfsv4stateid_t fdstateid, tdstateid;
int error = 0, ret = 0, gottd = 0, gotfd = 0, i;
-
+
*fattrflagp = 0;
*tattrflagp = 0;
nmp = VFSTONFS(fdvp->v_mount);
@@ -3086,7 +3085,6 @@ nfsrpc_readdir(vnode_t vp, struct uio *uiop, nfsuint64
reqsize = 5 * NFSX_UNSIGNED;
}
-
/*
* Loop around doing readdir rpc's of size readsize.
* The stopping criteria is EOF or buffer full.
@@ -3146,7 +3144,7 @@ nfsrpc_readdir(vnode_t vp, struct uio *uiop, nfsuint64
more_dirs = fxdr_unsigned(int, *tl);
if (!more_dirs)
tryformoredirs = 0;
-
+
/* loop through the dir entries, doctoring them to 4bsd form */
while (more_dirs && bigenough) {
if (nd->nd_flag & ND_NFSV4) {
@@ -3579,7 +3577,7 @@ nfsrpc_readdirplus(vnode_t vp, struct uio *uiop, nfsui
more_dirs = fxdr_unsigned(int, *tl);
if (!more_dirs)
tryformoredirs = 0;
-
+
/* loop through the dir entries, doctoring them to 4bsd form */
while (more_dirs && bigenough) {
NFSM_DISSECT(tl, u_int32_t *, 3 * NFSX_UNSIGNED);
@@ -3869,7 +3867,7 @@ nfsrpc_commit(vnode_t vp, u_quad_t offset, int cnt, st
nfsattrbit_t attrbits;
int error;
struct nfsmount *nmp = VFSTONFS(vp->v_mount);
-
+
*attrflagp = 0;
NFSCL_REQSTART(nd, NFSPROC_COMMIT, vp);
NFSM_BUILD(tl, u_int32_t *, 3 * NFSX_UNSIGNED);
@@ -4674,7 +4672,7 @@ nfsrpc_getacl(vnode_t vp, struct ucred *cred, NFSPROC_
int error;
nfsattrbit_t attrbits;
struct nfsmount *nmp = VFSTONFS(vp->v_mount);
-
+
if (nfsrv_useacl == 0 || !NFSHASNFSV4(nmp))
return (EOPNOTSUPP);
NFSCL_REQSTART(nd, NFSPROC_GETACL, vp);
@@ -4702,7 +4700,7 @@ nfsrpc_setacl(vnode_t vp, struct ucred *cred, NFSPROC_
{
int error;
struct nfsmount *nmp = VFSTONFS(vp->v_mount);
-
+
if (nfsrv_useacl == 0 || !NFSHASNFSV4(nmp))
return (EOPNOTSUPP);
error = nfsrpc_setattr(vp, NULL, aclp, cred, p, NULL, NULL, stuff);
@@ -4720,7 +4718,7 @@ nfsrpc_setaclrpc(vnode_t vp, struct ucred *cred, NFSPR
int error;
nfsattrbit_t attrbits;
struct nfsmount *nmp = VFSTONFS(vp->v_mount);
-
+
if (!NFSHASNFSV4(nmp))
return (EOPNOTSUPP);
NFSCL_REQSTART(nd, NFSPROC_SETACL, vp);
@@ -5121,7 +5119,7 @@ nfsrpc_getdeviceinfo(struct nfsmount *nmp, uint8_t *de
error = NFSERR_BADXDR;
goto nfsmout;
}
-
+
/*
* Now we know how many stripe indices and addresses, so
* we can allocate the structure the correct size.
@@ -6711,7 +6709,6 @@ nfscl_getsameserver(struct nfsmount *nmp, struct nfscl
*retdspp = dsp;
return (NFSDSP_USETHISSESSION);
}
-
}
}
if (fndseq != 0)
@@ -6733,7 +6730,7 @@ nfsrpc_commitds(vnode_t vp, uint64_t offset, int cnt,
struct nfssockreq *nrp;
struct nfsvattr na;
int attrflag, error;
-
+
nd->nd_mrep = NULL;
if (vers == 0 || vers == NFS_VER4) {
nfscl_reqstart(nd, NFSPROC_COMMITDS, nmp, fhp->nfh_fh,
@@ -6842,7 +6839,7 @@ nfsrpc_advise(vnode_t vp, off_t offset, uint64_t cnt,
struct nfsrv_descript nfsd, *nd = &nfsd;
nfsattrbit_t hints;
int error;
-
+
NFSZERO_ATTRBIT(&hints);
if (advise == POSIX_FADV_WILLNEED)
NFSSETBIT_ATTRBIT(&hints, NFSV4IOHINT_WILLNEED);
@@ -6881,7 +6878,7 @@ nfsrpc_adviseds(vnode_t vp, uint64_t offset, int cnt,
struct nfssockreq *nrp;
nfsattrbit_t hints;
int error;
-
+
/* For NFS DSs prior to NFSv4.2, just return OK. */
if (vers == NFS_VER3 || minorversion < NFSV42_MINORVERSION)
return (0);
@@ -7922,7 +7919,7 @@ nfsrpc_createlayout(vnode_t dvp, char *name, int namel
goto nfsmout;
op->nfso_stateid = stateid;
newnfs_copyincred(cred, &op->nfso_cred);
-
+
nfscl_openrelease(nmp, op, error, newone);
*unlockedp = 1;
Modified: head/sys/fs/nfsclient/nfs_clstate.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clstate.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/nfsclient/nfs_clstate.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -1917,7 +1917,7 @@ nfscl_umount(struct nfsmount *nmp, NFSPROC_T *p)
if (clp != NULL) {
if ((clp->nfsc_flags & NFSCLFLAGS_INITED) == 0)
panic("nfscl umount");
-
+
/*
* First, handshake with the nfscl renew thread, to terminate
* it.
@@ -1926,7 +1926,7 @@ nfscl_umount(struct nfsmount *nmp, NFSPROC_T *p)
while (clp->nfsc_flags & NFSCLFLAGS_HASTHREAD)
(void)mtx_sleep(clp, NFSCLSTATEMUTEXPTR, PWAIT,
"nfsclumnt", hz);
-
+
/*
* Now, get the exclusive lock on the client state, so
* that no uses of the state are still in progress.
@@ -1936,7 +1936,7 @@ nfscl_umount(struct nfsmount *nmp, NFSPROC_T *p)
NFSCLSTATEMUTEXPTR, NULL);
} while (!igotlock);
NFSUNLOCKCLSTATE();
-
+
/*
* Free up all the state. It will expire on the server, but
* maybe we should do a SetClientId/SetClientIdConfirm so
@@ -5479,4 +5479,3 @@ tryagain:
NFSUNLOCKCLSTATE();
return (0);
}
-
Modified: head/sys/fs/nfsclient/nfs_clsubs.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clsubs.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/nfsclient/nfs_clsubs.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -187,7 +187,7 @@ ncl_getattrcache(struct vnode *vp, struct vattr *vaper
int timeo, mustflush;
u_quad_t nsize;
bool setnsize;
-
+
np = VTONFS(vp);
vap = &np->n_vattr.na_vattr;
nmp = VFSTONFS(vp->v_mount);
@@ -273,7 +273,7 @@ ncl_getcookie(struct nfsnode *np, off_t off, int add)
struct nfsdmap *dp, *dp2;
int pos;
nfsuint64 *retval = NULL;
-
+
pos = (uoff_t)off / NFS_DIRBLKSIZ;
if (pos == 0 || off < 0) {
KASSERT(!add, ("nfs getcookie add at <= 0"));
@@ -388,4 +388,3 @@ ncl_init(struct vfsconf *vfsp)
return (0);
}
-
Modified: head/sys/fs/nfsclient/nfs_clvfsops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clvfsops.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/nfsclient/nfs_clvfsops.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -37,7 +37,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-
#include "opt_bootp.h"
#include "opt_nfsroot.h"
#include "opt_kern_tls.h"
@@ -180,7 +179,6 @@ SYSCTL_OPAQUE(_vfs_nfs, OID_AUTO, diskless_rootaddr, C
&nfsv3_diskless.root_saddr, sizeof(nfsv3_diskless.root_saddr),
"%Ssockaddr_in", "Diskless root nfs address");
-
void newnfsargs_ntoh(struct nfs_args *);
static int nfs_mountdiskless(char *,
struct sockaddr_in *, struct nfs_args *,
@@ -368,7 +366,7 @@ ncl_fsinfo(struct nfsmount *nmp, struct vnode *vp, str
struct nfsfsinfo fs;
struct nfsvattr nfsva;
int error, attrflag;
-
+
error = nfsrpc_fsinfo(vp, &fs, cred, td, &nfsva, &attrflag, NULL);
if (!error) {
if (attrflag)
@@ -1358,7 +1356,6 @@ out:
return (error);
}
-
/*
* VFS Operations.
*
@@ -1551,7 +1548,6 @@ mountnfs(struct nfs_args *argp, struct mount *mp, stru
else
nmp->nm_sockreq.nr_vers = NFS_VER2;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
