Deleted Added
full compact
ffs_vnops.c (274914) ffs_vnops.c (283735)
1/*-
2 * Copyright (c) 2002, 2003 Networks Associates Technology, Inc.
3 * All rights reserved.
4 *
5 * This software was developed for the FreeBSD Project by Marshall
6 * Kirk McKusick and Network Associates Laboratories, the Security
7 * Research Division of Network Associates, Inc. under DARPA/SPAWAR
8 * contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS

--- 48 unchanged lines hidden (view full) ---

57 * SUCH DAMAGE.
58 *
59 * from: @(#)ufs_readwrite.c 8.11 (Berkeley) 5/8/95
60 * from: $FreeBSD: .../ufs/ufs_readwrite.c,v 1.96 2002/08/12 09:22:11 phk ...
61 * @(#)ffs_vnops.c 8.15 (Berkeley) 5/14/95
62 */
63
64#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2002, 2003 Networks Associates Technology, Inc.
3 * All rights reserved.
4 *
5 * This software was developed for the FreeBSD Project by Marshall
6 * Kirk McKusick and Network Associates Laboratories, the Security
7 * Research Division of Network Associates, Inc. under DARPA/SPAWAR
8 * contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS

--- 48 unchanged lines hidden (view full) ---

57 * SUCH DAMAGE.
58 *
59 * from: @(#)ufs_readwrite.c 8.11 (Berkeley) 5/8/95
60 * from: $FreeBSD: .../ufs/ufs_readwrite.c,v 1.96 2002/08/12 09:22:11 phk ...
61 * @(#)ffs_vnops.c 8.15 (Berkeley) 5/14/95
62 */
63
64#include <sys/cdefs.h>
65__FBSDID("$FreeBSD: head/sys/ufs/ffs/ffs_vnops.c 274914 2014-11-23 12:01:52Z glebius $");
65__FBSDID("$FreeBSD: head/sys/ufs/ffs/ffs_vnops.c 283735 2015-05-29 13:24:17Z kib $");
66
67#include <sys/param.h>
68#include <sys/bio.h>
69#include <sys/systm.h>
70#include <sys/buf.h>
71#include <sys/conf.h>
72#include <sys/extattr.h>
73#include <sys/kernel.h>

--- 1287 unchanged lines hidden (view full) ---

1361struct vop_openextattr_args {
1362 struct vnodeop_desc *a_desc;
1363 struct vnode *a_vp;
1364 IN struct ucred *a_cred;
1365 IN struct thread *a_td;
1366};
1367*/
1368{
66
67#include <sys/param.h>
68#include <sys/bio.h>
69#include <sys/systm.h>
70#include <sys/buf.h>
71#include <sys/conf.h>
72#include <sys/extattr.h>
73#include <sys/kernel.h>

--- 1287 unchanged lines hidden (view full) ---

1361struct vop_openextattr_args {
1362 struct vnodeop_desc *a_desc;
1363 struct vnode *a_vp;
1364 IN struct ucred *a_cred;
1365 IN struct thread *a_td;
1366};
1367*/
1368{
1369 struct inode *ip;
1370 struct fs *fs;
1371
1369
1372 ip = VTOI(ap->a_vp);
1373 fs = ip->i_fs;
1374
1375 if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK)
1376 return (EOPNOTSUPP);
1377
1378 return (ffs_open_ea(ap->a_vp, ap->a_cred, ap->a_td));
1379}
1380
1381
1382/*

--- 6 unchanged lines hidden (view full) ---

1389 struct vnodeop_desc *a_desc;
1390 struct vnode *a_vp;
1391 int a_commit;
1392 IN struct ucred *a_cred;
1393 IN struct thread *a_td;
1394};
1395*/
1396{
1370 if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK)
1371 return (EOPNOTSUPP);
1372
1373 return (ffs_open_ea(ap->a_vp, ap->a_cred, ap->a_td));
1374}
1375
1376
1377/*

--- 6 unchanged lines hidden (view full) ---

1384 struct vnodeop_desc *a_desc;
1385 struct vnode *a_vp;
1386 int a_commit;
1387 IN struct ucred *a_cred;
1388 IN struct thread *a_td;
1389};
1390*/
1391{
1397 struct inode *ip;
1398 struct fs *fs;
1399
1392
1400 ip = VTOI(ap->a_vp);
1401 fs = ip->i_fs;
1402
1403 if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK)
1404 return (EOPNOTSUPP);
1405
1406 if (ap->a_commit && (ap->a_vp->v_mount->mnt_flag & MNT_RDONLY))
1407 return (EROFS);
1408
1409 return (ffs_close_ea(ap->a_vp, ap->a_commit, ap->a_cred, ap->a_td));
1410}

--- 96 unchanged lines hidden (view full) ---

1507 INOUT struct uio *a_uio;
1508 OUT size_t *a_size;
1509 IN struct ucred *a_cred;
1510 IN struct thread *a_td;
1511};
1512*/
1513{
1514 struct inode *ip;
1393 if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK)
1394 return (EOPNOTSUPP);
1395
1396 if (ap->a_commit && (ap->a_vp->v_mount->mnt_flag & MNT_RDONLY))
1397 return (EROFS);
1398
1399 return (ffs_close_ea(ap->a_vp, ap->a_commit, ap->a_cred, ap->a_td));
1400}

--- 96 unchanged lines hidden (view full) ---

1497 INOUT struct uio *a_uio;
1498 OUT size_t *a_size;
1499 IN struct ucred *a_cred;
1500 IN struct thread *a_td;
1501};
1502*/
1503{
1504 struct inode *ip;
1515 struct fs *fs;
1516 u_char *eae, *p;
1517 unsigned easize;
1518 int error, ealen;
1519
1520 ip = VTOI(ap->a_vp);
1505 u_char *eae, *p;
1506 unsigned easize;
1507 int error, ealen;
1508
1509 ip = VTOI(ap->a_vp);
1521 fs = ip->i_fs;
1522
1523 if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK)
1524 return (EOPNOTSUPP);
1525
1526 error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace,
1527 ap->a_cred, ap->a_td, VREAD);
1528 if (error)
1529 return (error);

--- 32 unchanged lines hidden (view full) ---

1562 INOUT struct uio *a_uio;
1563 OUT size_t *a_size;
1564 IN struct ucred *a_cred;
1565 IN struct thread *a_td;
1566};
1567*/
1568{
1569 struct inode *ip;
1510
1511 if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK)
1512 return (EOPNOTSUPP);
1513
1514 error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace,
1515 ap->a_cred, ap->a_td, VREAD);
1516 if (error)
1517 return (error);

--- 32 unchanged lines hidden (view full) ---

1550 INOUT struct uio *a_uio;
1551 OUT size_t *a_size;
1552 IN struct ucred *a_cred;
1553 IN struct thread *a_td;
1554};
1555*/
1556{
1557 struct inode *ip;
1570 struct fs *fs;
1571 u_char *eae, *p, *pe, *pn;
1572 unsigned easize;
1573 uint32_t ul;
1574 int error, ealen;
1575
1576 ip = VTOI(ap->a_vp);
1558 u_char *eae, *p, *pe, *pn;
1559 unsigned easize;
1560 uint32_t ul;
1561 int error, ealen;
1562
1563 ip = VTOI(ap->a_vp);
1577 fs = ip->i_fs;
1578
1579 if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK)
1580 return (EOPNOTSUPP);
1581
1582 error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace,
1583 ap->a_cred, ap->a_td, VREAD);
1584 if (error)
1585 return (error);

--- 175 unchanged lines hidden ---
1564
1565 if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK)
1566 return (EOPNOTSUPP);
1567
1568 error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace,
1569 ap->a_cred, ap->a_td, VREAD);
1570 if (error)
1571 return (error);

--- 175 unchanged lines hidden ---