Author: pjd
Date: Thu Jan 31 22:15:41 2013
New Revision: 246172
URL: http://svnweb.freebsd.org/changeset/base/246172

Log:
  Remove leftover label after Giant removal from VFS.

Modified:
  head/sys/kern/vfs_syscalls.c

Modified: head/sys/kern/vfs_syscalls.c
==============================================================================
--- head/sys/kern/vfs_syscalls.c        Thu Jan 31 22:14:16 2013        
(r246171)
+++ head/sys/kern/vfs_syscalls.c        Thu Jan 31 22:15:41 2013        
(r246172)
@@ -1108,7 +1108,7 @@ kern_openat(struct thread *td, int fd, c
 
                if (error == ERESTART)
                        error = EINTR;
-               goto bad_unlocked;
+               goto bad;
        }
        td->td_dupfd = 0;
        NDFREE(&nd, NDF_ONLY_PNBUF);
@@ -1150,12 +1150,11 @@ success:
                         */
                        if ((error = kern_capwrap(td, fp, nd.ni_baserights,
                            &indx)) != 0)
-                               goto bad_unlocked;
+                               goto bad;
                } else
 #endif
                        if ((error = finstall(td, fp, &indx, flags)) != 0)
-                               goto bad_unlocked;
-
+                               goto bad;
        }
 
        /*
@@ -1166,7 +1165,6 @@ success:
        td->td_retval[0] = indx;
        return (0);
 bad:
-bad_unlocked:
        KASSERT(indx == -1, ("indx=%d, should be -1", indx));
        fdrop(fp, td);
        return (error);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to