From owner-p4-projects@FreeBSD.ORG Sun May 20 21:43:48 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24F6716A41F; Sun, 20 May 2007 21:43:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9BA9316A421 for ; Sun, 20 May 2007 21:43:47 +0000 (UTC) (envelope-from smilicic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8BF9213C447 for ; Sun, 20 May 2007 21:43:47 +0000 (UTC) (envelope-from smilicic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4KLhlhP001286 for ; Sun, 20 May 2007 21:43:47 GMT (envelope-from smilicic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4KLhlW9001276 for perforce@freebsd.org; Sun, 20 May 2007 21:43:47 GMT (envelope-from smilicic@FreeBSD.org) Date: Sun, 20 May 2007 21:43:47 GMT Message-Id: <200705202143.l4KLhlW9001276@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to smilicic@FreeBSD.org using -f From: Sonja Milicic To: Perforce Change Reviews Cc: Subject: PERFORCE change 120125 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 May 2007 21:43:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=120125 Change 120125 by smilicic@tanarri_marilith on 2007/05/20 21:43:04 Style changes Affected files ... .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/g_log_fileops.c#2 edit Differences ... ==== //depot/projects/soc2007/smilicic_glog/sys/geom/log/g_log_fileops.c#2 (text+ko) ==== @@ -8,10 +8,10 @@ #include #include -static int +int glog_open_file(struct vnode *vn, char *filename, int uiflags) { - /*opens a file for reading or writing (specified in uiflags variable*/ + /*opens a file for reading or writing (specified in uiflags)*/ struct thread *td; struct nameidata *nd; int err; @@ -24,10 +24,11 @@ VOP_UNLOCK(nd->ni_vp, 0, td); vn = nd->ni_vp; + return err; } -static int +int glog_close_file(struct vnode *vn, int uiflags) { /*closes a file*/ @@ -36,11 +37,12 @@ td = curthread; err = vn_close(vn, uiflags, td->td_ucred, td); + return err; } -static int -glog_write_file(struct vnode *vp, struct uio *data) +int +glog_write_file(struct vnode *vn, struct uio *data) { /*appends data to a file*/ struct thread *td; @@ -49,26 +51,27 @@ td = curthread; data->uio_rw = UIO_WRITE; - vn_lock(vp, LK_EXCLUSIVE|LK_RETRY,td); - err = VOP_WRITE(vp, data, IO_APPEND|IO_SYNC, td->td_ucred); - VOP_UNLOCK(vp,0,td); + vn_lock(vn, LK_EXCLUSIVE|LK_RETRY,td); + err = VOP_WRITE(vn, data, IO_APPEND|IO_SYNC, td->td_ucred); + VOP_UNLOCK(vn, 0, td); return err; } -static int -glog_read_data(struct vnode *vp, struct uio *data) +int +glog_read_data(struct vnode *vn, struct uio *data) { /*reads data from a file*/ struct thread *td; int err; + td = curthread; bzero(data,sizeof(data)); data->uio_rw = UIO_READ; - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - err = VOP_READ(vp, data, IO_UNIT | IO_SYNC, td->td_ucred); - VOP_UNLOCK(vp, 0, td); + vn_lock(vn, LK_EXCLUSIVE | LK_RETRY, td); + err = VOP_READ(vn, data, IO_UNIT | IO_SYNC, td->td_ucred); + VOP_UNLOCK(vn, 0, td); return err; }