Changeset 6e4709b in rtems-libbsd

Timestamp:

01/05/23 16:42:48 (3 months ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

6-freebsd-12

Children:

b0fc22c

Parents:

84d15c2

git-author:

Sebastian Huber <sebastian.huber@…> (01/05/23 16:42:48)

git-committer:

Sebastian Huber <sebastian.huber@…> (01/12/23 07:22:59)

Message:

vfs/nfs: Revert white space changes

Location:

freebsd/sys

Files:

• fs/nfs/nfs_commonkrpc.c (modified) (11 diffs)
• fs/nfs/nfs_commonport.c (modified) (1 diff)
• fs/nfs/nfs_commonsubs.c (modified) (1 diff)
• fs/nfsclient/nfs.h (modified) (1 diff)
• fs/nfsclient/nfs_clbio.c (modified) (2 diffs)
• fs/nfsclient/nfs_clkrpc.c (modified) (1 diff)
• fs/nfsclient/nfs_clport.c (modified) (1 diff)
• fs/nfsclient/nfs_clrpcops.c (modified) (1 diff)
• fs/nfsclient/nfs_clstate.c (modified) (1 diff)
• fs/nfsclient/nfs_clsubs.c (modified) (1 diff)
• fs/nfsclient/nfs_clvfsops.c (modified) (1 diff)
• fs/nfsclient/nfs_clvnops.c (modified) (20 diffs)
• kern/kern_prot.c (modified) (1 diff)
• kern/vfs_bio.c (modified) (1 diff)
• kern/vfs_export.c (modified) (1 diff)
• kern/vfs_syscalls.c (modified) (1 diff)
• kern/vfs_vnops.c (modified) (1 diff)
• nfs/nfs_nfssvc.c (modified) (1 diff)
• rpc/svc.c (modified) (1 diff)
• rpc/svc_auth.c (modified) (1 diff)

freebsd/sys/fs/nfs/nfs_commonkrpc.c

@@ -220 +220 @@
                 else
                         nconf = getnetconfigent("tcp6");
-
+                        
         pktscale = nfs_bufpackets;
         if (pktscale < 2)
@@ -238 +238 @@
         so = NULL;
         saddr = NFSSOCKADDR(nrp->nr_nam, struct sockaddr *);
-        error = socreate(saddr->sa_family, &so, nrp->nr_sotype,
+        error = socreate(saddr->sa_family, &so, nrp->nr_sotype, 
             nrp->nr_soproto, td->td_ucred, td);
         if (error) {
@@ -392 +392 @@
                  * For UDP, there are 2 timeouts:
                  * - CLSET_RETRY_TIMEOUT sets the initial timeout for the timer
-                 *   that does a retransmit of an RPC request using the same
+                 *   that does a retransmit of an RPC request using the same 
                  *   socket and xid. This is what you normally want to do,
                  *   since NFS servers depend on "same xid" for their
@@ -742 +742 @@
                         uint32_t probe_id;
                         int probe_procnum;
-
+        
                         if (nd->nd_flag & ND_NFSV4) {
                                 probe_id =
@@ -1144 +1144 @@
                                       j != NFSERR_BADSTATEID &&
                                       j != NFSERR_BADSEQID &&
-                                      j != NFSERR_BADXDR &&
+                                      j != NFSERR_BADXDR &&      
                                       j != NFSERR_RESOURCE &&
-                                      j != NFSERR_NOFILEHANDLE)))
+                                      j != NFSERR_NOFILEHANDLE)))                
                                         nd->nd_flag |= ND_INCRSEQID;
                         }
@@ -1265 +1265 @@
 {
         int i;
-
+        
         for (i = 0 ; i < nitems(newnfs_sig_set); i++)
                 if (SIGISMEMBER(set, newnfs_sig_set[i]))
@@ -1271 +1271 @@
         return (0);
 }
-
+ 
 /*
  * The set/restore sigmask functions are used to (temporarily) overwrite
@@ -1284 +1284 @@
         int i;
         struct proc *p;
-
+        
         SIGFILLSET(newset);
         if (td == NULL)
@@ -1350 +1350 @@
         struct proc *p;
         sigset_t tmpset;
-
+        
         /* Terminate all requests while attempting a forced unmount. */
         if (NFSCL_FORCEDISM(nmp->nm_mountp))
@@ -1434 +1434 @@
         } else
                 mtx_unlock(&nmp->nm_mtx);
-
+        
         mtx_lock(&nmp->nm_mtx);
         if ((flags & NFSSTA_LOCKTIMEO) && (nmp->nm_state & NFSSTA_LOCKTIMEO)) {
@@ -1444 +1444 @@
                 mtx_unlock(&nmp->nm_mtx);
 }
+

freebsd/sys/fs/nfs/nfs_commonport.c

@@ -819 +819 @@
 MODULE_DEPEND(nfscommon, nfssvc, 1, 1, 1);
 MODULE_DEPEND(nfscommon, krpc, 1, 1, 1);
+

freebsd/sys/fs/nfs/nfs_commonsubs.c

@@ -4771 +4771 @@
         return (ds);
 }
+

freebsd/sys/fs/nfsclient/nfs.h

@@ -97 +97 @@
 int ncl_biowrite(struct vnode *, struct uio *, int, struct ucred *);
 int ncl_vinvalbuf(struct vnode *, int, struct thread *, int);
-int ncl_asyncio(struct
-                nfsmount *, struct buf *, struct ucred *,
+int ncl_asyncio(struct nfsmount *, struct buf *, struct ucred *,
     struct thread *);
 int ncl_doio(struct vnode *, struct buf *, struct ucred *, struct thread *,

freebsd/sys/fs/nfsclient/nfs_clbio.c

@@ -1696 +1696 @@
 #else /* __rtems__ */
                                 panic("nfsclient: text file modification: want to killproc");
-#endif /* _-rtems__ */
+#endif /* __rtems__ */
                         } else
                                 NFSUNLOCKNODE(np);
@@ -1924 +1924 @@
         return(error);
 }
+

freebsd/sys/fs/nfsclient/nfs_clkrpc.c

@@ -299 +299 @@
         }
 }
+

freebsd/sys/fs/nfsclient/nfs_clport.c

@@ -1453 +1453 @@
 MODULE_DEPEND(nfscl, nfssvc, 1, 1, 1);
 MODULE_DEPEND(nfscl, nfslock, 1, 1, 1);
+

freebsd/sys/fs/nfsclient/nfs_clrpcops.c

@@ -7741 +7741 @@
         return (laystat);
 }
+

freebsd/sys/fs/nfsclient/nfs_clstate.c

@@ -5458 +5458 @@
         return (0);
 }
+

freebsd/sys/fs/nfsclient/nfs_clsubs.c

@@ -395 +395 @@
         return (0);
 }
+

freebsd/sys/fs/nfsclient/nfs_clvfsops.c

@@ -2061 +2061 @@
         nfscl_printoptval(nmp, nmp->nm_retry, ",retrans", &buf, &blen);
 }
+

freebsd/sys/fs/nfsclient/nfs_clvnops.c

@@ -818 +818 @@
                     error = ncl_flush(vp, MNT_WAIT, ap->a_td, cm, 0);
                     /* np->n_flag &= ~NMODIFIED; */
-                } else if (NFS_ISV4(vp)) {
+                } else if (NFS_ISV4(vp)) { 
                         if (nfscl_mustflush(vp) != 0) {
                                 int cm = newnfs_commit_on_close ? 1 : 0;
@@ -834 +834 @@
                 NFSLOCKNODE(np);
             }
-            /*
+            /* 
              * Invalidate the attribute cache in all cases.
              * An open is going to fetch fresh attrs any way, other procs
-             * on this node that have file open will be forced to do an
+             * on this node that have file open will be forced to do an 
              * otw attr fetch, but this is safe.
              * --> A user found that their RPC count dropped by 20% when
@@ -892 +892 @@
         if (newnfs_directio_enable && (fmode & O_DIRECT) && (vp->v_type == VREG)) {
                 NFSLOCKNODE(np);
-                KASSERT((np->n_directio_opens > 0),
+                KASSERT((np->n_directio_opens > 0), 
                         ("nfs_close: unexpectedly value (0) of n_directio_opens\n"));
                 np->n_directio_opens--;
@@ -1022 +1022 @@
                             vap->va_uid == (uid_t)VNOVAL &&
                             vap->va_gid == (gid_t)VNOVAL)
-                                return (0);
+                                return (0);             
                         vap->va_size = VNOVAL;
                         break;
@@ -1073 +1073 @@
         } else {
                 NFSLOCKNODE(np);
-                if ((vap->va_mtime.tv_sec != VNOVAL || vap->va_atime.tv_sec != VNOVAL) &&
+                if ((vap->va_mtime.tv_sec != VNOVAL || vap->va_atime.tv_sec != VNOVAL) && 
                     (np->n_flag & NMODIFIED) && vp->v_type == VREG) {
                         NFSUNLOCKNODE(np);
@@ -1147 +1147 @@
         struct vattr vattr;
         struct timespec nctime;
-
+        
         *vpp = NULLVP;
         if ((flags & ISLASTCN) && (mp->mnt_flag & MNT_RDONLY) &&
@@ -1224 +1224 @@
                 if (dvp != newvp)
                         vput(newvp);
-                else
+                else 
                         vrele(newvp);
                 *vpp = NULLVP;
@@ -1380 +1380 @@
                             0, 1);
                 else if ((flags & (ISLASTCN | ISOPEN)) == (ISLASTCN | ISOPEN) &&
-                    !(np->n_flag & NMODIFIED)) {
+                    !(np->n_flag & NMODIFIED)) {                        
                         /*
                          * Flush the attribute cache when opening a
@@ -1712 +1712 @@
                                 vap->va_uid = (uid_t)VNOVAL;
                                 vap->va_gid = (uid_t)VNOVAL;
-                                error = nfsrpc_setattr(newvp, vap, NULL,
+                                error = nfsrpc_setattr(newvp, vap, NULL, 
                                     cnp->cn_cred, cnp->cn_thread, &nfsva,
                                     &attrflag, NULL);
@@ -1900 +1900 @@
          * ( as far as I can tell ) it flushes dirty buffers more
          * often.
-         *
+         * 
          * Skip the rename operation if the fsync fails, this can happen
          * due to the server's volume being full, when we pushed out data
@@ -2312 +2312 @@
         int error = 0;
         struct vattr vattr;
-
+        
         if (ap->a_eofflag != NULL)
                 *ap->a_eofflag = 0;
-        if (vp->v_type != VDIR)
+        if (vp->v_type != VDIR) 
                 return(EPERM);
 
@@ -2359 +2359 @@
                         *ap->a_eofflag = 1;
         }
-
+        
         /* Add the partial DIRBLKSIZ (left) back in. */
         uio->uio_resid += left;
@@ -2393 +2393 @@
                 ncl_dircookie_unlock(dnp);
         } else {
-                ncl_dircookie_unlock(dnp);
+                ncl_dircookie_unlock(dnp);              
                 return (NFSERR_BAD_COOKIE);
         }
@@ -2511 +2511 @@
         VREF(dvp);
 
-        /*
+        /* 
          * Fudge together a funny name.
-         * Changing the format of the funny name to accommodate more
+         * Changing the format of the funny name to accommodate more 
          * sillynames per directory.
-         * The name is now changed to .nfs.<ticks>.<pid>.4, where ticks is
+         * The name is now changed to .nfs.<ticks>.<pid>.4, where ticks is 
          * CPU ticks since boot.
          */
@@ -2525 +2525 @@
         lticks = (unsigned int)ticks;
         for ( ; ; ) {
-                sp->s_namlen = sprintf(sp->s_name,
-                                       ".nfs.%08x.%04x4.4", lticks,
+                sp->s_namlen = sprintf(sp->s_name, 
+                                       ".nfs.%08x.%04x4.4", lticks, 
                                        pid);
                 if (nfs_lookitup(dvp, sp->s_name, sp->s_namlen, sp->s_cred,
@@ -3062 +3062 @@
                         np->n_flag |= NFSYNCWAIT;
                         error = newnfs_msleep(td, &np->n_directio_asyncwr,
-                            &np->n_mtx, slpflag | (PRIBIO + 1),
+                            &np->n_mtx, slpflag | (PRIBIO + 1), 
                             "nfsfsync", 0);
                         if (error) {
                                 if (newnfs_sigintr(nmp, td)) {
                                         NFSUNLOCKNODE(np);
-                                        error = EINTR;
+                                        error = EINTR;  
                                         goto done;
                                 }
@@ -3127 +3127 @@
         int ret, error = EOPNOTSUPP;
         u_quad_t size;
-
+        
         ret = NFSVOPLOCK(vp, LK_SHARED);
         if (ret != 0)
@@ -3262 +3262 @@
         u_quad_t size;
         int error;
-
+        
         if (NFS_ISV4(vp))
                 return (EOPNOTSUPP);
@@ -3410 +3410 @@
         NFSUNLOCKNODE(np);
         error = fifo_specops.vop_read(ap);
-        return error;
+        return error;   
 #else /* __rtems__ */
         return (EINVAL);
@@ -3647 +3647 @@
         return (error);
 }
+

freebsd/sys/kern/kern_prot.c

@@ -1853 +1853 @@
 crhold(struct ucred *cr)
 {
+
 #ifdef __rtems__
         if (cr == NULL)

freebsd/sys/kern/vfs_bio.c

@@ -2968 +2968 @@
 #ifndef __rtems__
                 pmap_qremove(trunc_page((vm_offset_t)bp->b_data), bp->b_npages);
-#endif /* _-rtems__ */
+#endif /* __rtems__ */
         } else
                 BUF_CHECK_UNMAPPED(bp);

freebsd/sys/kern/vfs_export.c

@@ -539 +539 @@
         return (0);
 }
+

freebsd/sys/kern/vfs_syscalls.c

@@ -3537 +3537 @@
             &cap_renameat_source_rights, td);
 #else
-
         NDINIT_ATRIGHTS(&fromnd, DELETE, WANTPARENT | SAVESTART | AUDITVNODE1,
             pathseg, old, oldfd,

freebsd/sys/kern/vfs_vnops.c

@@ -1253 +1253 @@
 {
 #ifndef __rtems__
-        return (EFAULT);
         struct uio transp_uio;
         struct iovec transp_iov[1];

freebsd/sys/nfs/nfs_nfssvc.c

@@ -162 +162 @@
 /* So that loader and kldload(2) can find us, wherever we are.. */
 MODULE_VERSION(nfssvc, 1);
+

freebsd/sys/rpc/svc.c

@@ -1380 +1380 @@
         pool->sp_proc = NULL;
 #endif /* __rtems__ */
-
         /* Choose group count based on number of threads and CPUs. */
         pool->sp_groupcount = max(1, min(SVC_MAXGROUPS,

freebsd/sys/rpc/svc_auth.c

@@ -200 +200 @@
         }
 }
+