From owner-svn-src-head@FreeBSD.ORG Fri Nov 14 09:58:16 2008 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E7B89106564A; Fri, 14 Nov 2008 09:58:16 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D7D8F8FC13; Fri, 14 Nov 2008 09:58:16 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAE9wGxn086902; Fri, 14 Nov 2008 09:58:16 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAE9wGcx086897; Fri, 14 Nov 2008 09:58:16 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <200811140958.mAE9wGcx086897@svn.freebsd.org> From: Edward Tomasz Napierala Date: Fri, 14 Nov 2008 09:58:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184965 - in head/sys/gnu/fs/xfs: . FreeBSD X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Nov 2008 09:58:17 -0000 Author: trasz Date: Fri Nov 14 09:58:16 2008 New Revision: 184965 URL: http://svn.freebsd.org/changeset/base/184965 Log: Adapt to accmode_t changes. Approved by: rwatson (mentor), kan Modified: head/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h head/sys/gnu/fs/xfs/xfs_dfrag.c head/sys/gnu/fs/xfs/xfs_inode.c head/sys/gnu/fs/xfs/xfs_inode.h head/sys/gnu/fs/xfs/xfs_vnodeops.c Modified: head/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h ============================================================================== --- head/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h Fri Nov 14 08:43:01 2008 (r184964) +++ head/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h Fri Nov 14 09:58:16 2008 (r184965) @@ -292,8 +292,8 @@ typedef struct xfs_vnodeops { rv = _VOP_(vop_getattr, vp)((vp)->v_fbhv, vap, f, cr) #define XVOP_SETATTR(vp, vap, f, cr, rv) \ rv = _VOP_(vop_setattr, vp)((vp)->v_fbhv, vap, f, cr) -#define XVOP_ACCESS(vp, mode, cr, rv) \ - rv = _VOP_(vop_access, vp)((vp)->v_fbhv, mode, cr) +#define XVOP_ACCESS(vp, accmode, cr, rv) \ + rv = _VOP_(vop_access, vp)((vp)->v_fbhv, accmode, cr) #define XVOP_LOOKUP(vp,d,vpp,f,rdir,cr,rv) \ rv = _VOP_(vop_lookup, vp)((vp)->v_fbhv,d,vpp,f,rdir,cr) #define XVOP_CREATE(dvp,d,vap,vpp,cr,rv) \ Modified: head/sys/gnu/fs/xfs/xfs_dfrag.c ============================================================================== --- head/sys/gnu/fs/xfs/xfs_dfrag.c Fri Nov 14 08:43:01 2008 (r184964) +++ head/sys/gnu/fs/xfs/xfs_dfrag.c Fri Nov 14 09:58:16 2008 (r184965) @@ -181,11 +181,11 @@ xfs_swap_extents( locked = 1; /* Check permissions */ - error = xfs_iaccess(ip, S_IWUSR, NULL); + error = xfs_iaccess(ip, VWRITE, NULL); if (error) goto error0; - error = xfs_iaccess(tip, S_IWUSR, NULL); + error = xfs_iaccess(tip, VWRITE, NULL); if (error) goto error0; Modified: head/sys/gnu/fs/xfs/xfs_inode.c ============================================================================== --- head/sys/gnu/fs/xfs/xfs_inode.c Fri Nov 14 08:43:01 2008 (r184964) +++ head/sys/gnu/fs/xfs/xfs_inode.c Fri Nov 14 09:58:16 2008 (r184965) @@ -3610,7 +3610,7 @@ xfs_iflush_all( int xfs_iaccess( xfs_inode_t *ip, - mode_t mode, + accmode_t accmode, cred_t *cr) { xfs_vnode_t *vp; @@ -3624,10 +3624,10 @@ xfs_iaccess( /* * Verify that the MAC policy allows the requested access. */ - if ((error = _MAC_XFS_IACCESS(ip, mode, cr))) + if ((error = _MAC_XFS_IACCESS(ip, accmode, cr))) return XFS_ERROR(error); - if (mode & S_IWUSR) { + if (accmode & VWRITE) { xfs_mount_t *mp = ip->i_mount; if ((XVFSTOMNT(XFS_MTOVFS(mp))->mnt_flag & MNT_RDONLY) && @@ -3644,13 +3644,13 @@ xfs_iaccess( * If there's an Access Control List it's used instead of * the mode bits. */ - if ((error = _ACL_XFS_IACCESS(ip, mode, cr)) != -1) + if ((error = _ACL_XFS_IACCESS(ip, accmode, cr)) != -1) return error ? XFS_ERROR(error) : 0; /* FreeBSD local change here */ error = vaccess(vp->v_vnode->v_type, imode, ip->i_d.di_uid, ip->i_d.di_gid, - mode, cr, NULL); + accmode, cr, NULL); return (error); } Modified: head/sys/gnu/fs/xfs/xfs_inode.h ============================================================================== --- head/sys/gnu/fs/xfs/xfs_inode.h Fri Nov 14 08:43:01 2008 (r184964) +++ head/sys/gnu/fs/xfs/xfs_inode.h Fri Nov 14 09:58:16 2008 (r184965) @@ -455,7 +455,7 @@ void xfs_iunpin(xfs_inode_t *); int xfs_iextents_copy(xfs_inode_t *, xfs_bmbt_rec_t *, int); int xfs_iflush(xfs_inode_t *, uint); void xfs_iflush_all(struct xfs_mount *); -int xfs_iaccess(xfs_inode_t *, mode_t, cred_t *); +int xfs_iaccess(xfs_inode_t *, accmode_t, cred_t *); uint xfs_iroundup(uint); void xfs_ichgtime(xfs_inode_t *, int); xfs_fsize_t xfs_file_last_byte(xfs_inode_t *); Modified: head/sys/gnu/fs/xfs/xfs_vnodeops.c ============================================================================== --- head/sys/gnu/fs/xfs/xfs_vnodeops.c Fri Nov 14 08:43:01 2008 (r184964) +++ head/sys/gnu/fs/xfs/xfs_vnodeops.c Fri Nov 14 09:58:16 2008 (r184965) @@ -922,7 +922,7 @@ xfs_setattr( STATIC int xfs_access( bhv_desc_t *bdp, - int mode, + accmode_t accmode, cred_t *credp) { xfs_inode_t *ip; @@ -933,7 +933,7 @@ xfs_access( ip = XFS_BHVTOI(bdp); xfs_ilock(ip, XFS_ILOCK_SHARED); - error = xfs_iaccess(ip, mode, credp); + error = xfs_iaccess(ip, accmode, credp); xfs_iunlock(ip, XFS_ILOCK_SHARED); return error; } @@ -4538,7 +4538,7 @@ xfs_change_file_space( xfs_ilock(ip, XFS_ILOCK_SHARED); - if ((error = xfs_iaccess(ip, S_IWUSR, credp))) { + if ((error = xfs_iaccess(ip, VWRITE, credp))) { xfs_iunlock(ip, XFS_ILOCK_SHARED); return error; }