From owner-svn-src-all@FreeBSD.ORG Fri Mar 1 21:58:56 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A92E47B0; Fri, 1 Mar 2013 21:58:56 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9C024199B; Fri, 1 Mar 2013 21:58:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r21LwuBM007120; Fri, 1 Mar 2013 21:58:56 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r21Lwu9k007119; Fri, 1 Mar 2013 21:58:56 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <201303012158.r21Lwu9k007119@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Fri, 1 Mar 2013 21:58:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r247586 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Mar 2013 21:58:56 -0000 Author: pjd Date: Fri Mar 1 21:58:56 2013 New Revision: 247586 URL: http://svnweb.freebsd.org/changeset/base/247586 Log: Remove unnecessary variables. Modified: head/sys/kern/vfs_vnops.c Modified: head/sys/kern/vfs_vnops.c ============================================================================== --- head/sys/kern/vfs_vnops.c Fri Mar 1 21:58:51 2013 (r247585) +++ head/sys/kern/vfs_vnops.c Fri Mar 1 21:58:56 2013 (r247586) @@ -1860,7 +1860,6 @@ vn_chmod(struct file *fp, mode_t mode, s struct thread *td) { struct vnode *vp; - int error; vp = fp->f_vnode; #ifdef AUDIT @@ -1868,8 +1867,7 @@ vn_chmod(struct file *fp, mode_t mode, s AUDIT_ARG_VNODE1(vp); VOP_UNLOCK(vp, 0); #endif - error = setfmode(td, active_cred, vp, mode); - return (error); + return (setfmode(td, active_cred, vp, mode)); } int @@ -1877,7 +1875,6 @@ vn_chown(struct file *fp, uid_t uid, gid struct thread *td) { struct vnode *vp; - int error; vp = fp->f_vnode; #ifdef AUDIT @@ -1885,8 +1882,7 @@ vn_chown(struct file *fp, uid_t uid, gid AUDIT_ARG_VNODE1(vp); VOP_UNLOCK(vp, 0); #endif - error = setfown(td, active_cred, vp, uid, gid); - return (error); + return (setfown(td, active_cred, vp, uid, gid)); } void