diff options
author | Nathan Scott <nathans@sgi.com> | 2006-06-09 03:07:12 -0400 |
---|---|---|
committer | Nathan Scott <nathans@sgi.com> | 2006-06-09 03:07:12 -0400 |
commit | 8285fb58e75bfdb447c7a2c533ec9efdb238f966 (patch) | |
tree | 4bcfa74d3328ff5d71437556d24019be98c1d9fa | |
parent | 67fcaa73adafb19139a7cd8ab133592b6a0a0901 (diff) |
[XFS] Resolve a namespace collision on remaining vtypes for FreeBSD
porters.
SGI-PV: 953338
SGI-Modid: xfs-linux-melb:xfs-kern:26108a
Signed-off-by: Nathan Scott <nathans@sgi.com>
-rw-r--r-- | fs/xfs/linux-2.6/xfs_ioctl.c | 2 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_iops.c | 16 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_lrw.c | 10 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_vfs.c | 4 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_vfs.h | 8 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_vnode.c | 6 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_vnode.h | 64 | ||||
-rw-r--r-- | fs/xfs/quota/xfs_qm_bhv.c | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_acl.c | 10 | ||||
-rw-r--r-- | fs/xfs/xfs_acl.h | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_mount.h | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_rename.c | 8 | ||||
-rw-r--r-- | fs/xfs/xfs_rw.h | 7 | ||||
-rw-r--r-- | fs/xfs/xfs_utils.c | 4 | ||||
-rw-r--r-- | fs/xfs/xfs_utils.h | 8 | ||||
-rw-r--r-- | fs/xfs/xfs_vfsops.c | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_vnodeops.c | 32 |
17 files changed, 94 insertions, 93 deletions
diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c index 73182503c16e..a0e247c71323 100644 --- a/fs/xfs/linux-2.6/xfs_ioctl.c +++ b/fs/xfs/linux-2.6/xfs_ioctl.c | |||
@@ -1157,7 +1157,7 @@ xfs_ioc_xattr( | |||
1157 | void __user *arg) | 1157 | void __user *arg) |
1158 | { | 1158 | { |
1159 | struct fsxattr fa; | 1159 | struct fsxattr fa; |
1160 | struct vattr *vattr; | 1160 | struct bhv_vattr *vattr; |
1161 | int error = 0; | 1161 | int error = 0; |
1162 | int attr_flags; | 1162 | int attr_flags; |
1163 | unsigned int flags; | 1163 | unsigned int flags; |
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c index 0857658882e0..484daef91d7f 100644 --- a/fs/xfs/linux-2.6/xfs_iops.c +++ b/fs/xfs/linux-2.6/xfs_iops.c | |||
@@ -200,7 +200,7 @@ xfs_ichgtime_fast( | |||
200 | STATIC void | 200 | STATIC void |
201 | xfs_validate_fields( | 201 | xfs_validate_fields( |
202 | struct inode *ip, | 202 | struct inode *ip, |
203 | struct vattr *vattr) | 203 | bhv_vattr_t *vattr) |
204 | { | 204 | { |
205 | vattr->va_mask = XFS_AT_NLINK|XFS_AT_SIZE|XFS_AT_NBLOCKS; | 205 | vattr->va_mask = XFS_AT_NLINK|XFS_AT_SIZE|XFS_AT_NBLOCKS; |
206 | if (!bhv_vop_getattr(vn_from_inode(ip), vattr, ATTR_LAZY, NULL)) { | 206 | if (!bhv_vop_getattr(vn_from_inode(ip), vattr, ATTR_LAZY, NULL)) { |
@@ -290,7 +290,7 @@ xfs_vn_mknod( | |||
290 | dev_t rdev) | 290 | dev_t rdev) |
291 | { | 291 | { |
292 | struct inode *ip; | 292 | struct inode *ip; |
293 | vattr_t vattr = { 0 }; | 293 | bhv_vattr_t vattr = { 0 }; |
294 | bhv_vnode_t *vp = NULL, *dvp = vn_from_inode(dir); | 294 | bhv_vnode_t *vp = NULL, *dvp = vn_from_inode(dir); |
295 | xfs_acl_t *default_acl = NULL; | 295 | xfs_acl_t *default_acl = NULL; |
296 | attrexists_t test_default_acl = _ACL_DEFAULT_EXISTS; | 296 | attrexists_t test_default_acl = _ACL_DEFAULT_EXISTS; |
@@ -417,7 +417,7 @@ xfs_vn_link( | |||
417 | struct inode *ip; /* inode of guy being linked to */ | 417 | struct inode *ip; /* inode of guy being linked to */ |
418 | bhv_vnode_t *tdvp; /* target directory for new name/link */ | 418 | bhv_vnode_t *tdvp; /* target directory for new name/link */ |
419 | bhv_vnode_t *vp; /* vp of name being linked */ | 419 | bhv_vnode_t *vp; /* vp of name being linked */ |
420 | vattr_t vattr; | 420 | bhv_vattr_t vattr; |
421 | int error; | 421 | int error; |
422 | 422 | ||
423 | ip = old_dentry->d_inode; /* inode being linked to */ | 423 | ip = old_dentry->d_inode; /* inode being linked to */ |
@@ -444,7 +444,7 @@ xfs_vn_unlink( | |||
444 | { | 444 | { |
445 | struct inode *inode; | 445 | struct inode *inode; |
446 | bhv_vnode_t *dvp; /* directory containing name to remove */ | 446 | bhv_vnode_t *dvp; /* directory containing name to remove */ |
447 | vattr_t vattr; | 447 | bhv_vattr_t vattr; |
448 | int error; | 448 | int error; |
449 | 449 | ||
450 | inode = dentry->d_inode; | 450 | inode = dentry->d_inode; |
@@ -465,7 +465,7 @@ xfs_vn_symlink( | |||
465 | const char *symname) | 465 | const char *symname) |
466 | { | 466 | { |
467 | struct inode *ip; | 467 | struct inode *ip; |
468 | vattr_t va = { 0 }; | 468 | bhv_vattr_t va = { 0 }; |
469 | bhv_vnode_t *dvp; /* directory containing name of symlink */ | 469 | bhv_vnode_t *dvp; /* directory containing name of symlink */ |
470 | bhv_vnode_t *cvp; /* used to lookup symlink to put in dentry */ | 470 | bhv_vnode_t *cvp; /* used to lookup symlink to put in dentry */ |
471 | int error; | 471 | int error; |
@@ -499,7 +499,7 @@ xfs_vn_rmdir( | |||
499 | { | 499 | { |
500 | struct inode *inode = dentry->d_inode; | 500 | struct inode *inode = dentry->d_inode; |
501 | bhv_vnode_t *dvp = vn_from_inode(dir); | 501 | bhv_vnode_t *dvp = vn_from_inode(dir); |
502 | vattr_t vattr; | 502 | bhv_vattr_t vattr; |
503 | int error; | 503 | int error; |
504 | 504 | ||
505 | error = bhv_vop_rmdir(dvp, dentry, NULL); | 505 | error = bhv_vop_rmdir(dvp, dentry, NULL); |
@@ -520,7 +520,7 @@ xfs_vn_rename( | |||
520 | struct inode *new_inode = ndentry->d_inode; | 520 | struct inode *new_inode = ndentry->d_inode; |
521 | bhv_vnode_t *fvp; /* from directory */ | 521 | bhv_vnode_t *fvp; /* from directory */ |
522 | bhv_vnode_t *tvp; /* target directory */ | 522 | bhv_vnode_t *tvp; /* target directory */ |
523 | vattr_t vattr; | 523 | bhv_vattr_t vattr; |
524 | int error; | 524 | int error; |
525 | 525 | ||
526 | fvp = vn_from_inode(odir); | 526 | fvp = vn_from_inode(odir); |
@@ -643,7 +643,7 @@ xfs_vn_setattr( | |||
643 | struct inode *inode = dentry->d_inode; | 643 | struct inode *inode = dentry->d_inode; |
644 | unsigned int ia_valid = attr->ia_valid; | 644 | unsigned int ia_valid = attr->ia_valid; |
645 | bhv_vnode_t *vp = vn_from_inode(inode); | 645 | bhv_vnode_t *vp = vn_from_inode(inode); |
646 | vattr_t vattr = { 0 }; | 646 | bhv_vattr_t vattr = { 0 }; |
647 | int flags = 0; | 647 | int flags = 0; |
648 | int error; | 648 | int error; |
649 | 649 | ||
diff --git a/fs/xfs/linux-2.6/xfs_lrw.c b/fs/xfs/linux-2.6/xfs_lrw.c index a9b83018f0fb..8696096f8d22 100644 --- a/fs/xfs/linux-2.6/xfs_lrw.c +++ b/fs/xfs/linux-2.6/xfs_lrw.c | |||
@@ -258,7 +258,7 @@ xfs_read( | |||
258 | 258 | ||
259 | if (DM_EVENT_ENABLED(vp->v_vfsp, ip, DM_EVENT_READ) && | 259 | if (DM_EVENT_ENABLED(vp->v_vfsp, ip, DM_EVENT_READ) && |
260 | !(ioflags & IO_INVIS)) { | 260 | !(ioflags & IO_INVIS)) { |
261 | vrwlock_t locktype = VRWLOCK_READ; | 261 | bhv_vrwlock_t locktype = VRWLOCK_READ; |
262 | int dmflags = FILP_DELAY_FLAG(file) | DM_SEM_FLAG_RD(ioflags); | 262 | int dmflags = FILP_DELAY_FLAG(file) | DM_SEM_FLAG_RD(ioflags); |
263 | 263 | ||
264 | ret = -XFS_SEND_DATA(mp, DM_EVENT_READ, | 264 | ret = -XFS_SEND_DATA(mp, DM_EVENT_READ, |
@@ -313,7 +313,7 @@ xfs_sendfile( | |||
313 | 313 | ||
314 | if (DM_EVENT_ENABLED(BHV_TO_VNODE(bdp)->v_vfsp, ip, DM_EVENT_READ) && | 314 | if (DM_EVENT_ENABLED(BHV_TO_VNODE(bdp)->v_vfsp, ip, DM_EVENT_READ) && |
315 | (!(ioflags & IO_INVIS))) { | 315 | (!(ioflags & IO_INVIS))) { |
316 | vrwlock_t locktype = VRWLOCK_READ; | 316 | bhv_vrwlock_t locktype = VRWLOCK_READ; |
317 | int error; | 317 | int error; |
318 | 318 | ||
319 | error = XFS_SEND_DATA(mp, DM_EVENT_READ, BHV_TO_VNODE(bdp), | 319 | error = XFS_SEND_DATA(mp, DM_EVENT_READ, BHV_TO_VNODE(bdp), |
@@ -357,7 +357,7 @@ xfs_splice_read( | |||
357 | 357 | ||
358 | if (DM_EVENT_ENABLED(BHV_TO_VNODE(bdp)->v_vfsp, ip, DM_EVENT_READ) && | 358 | if (DM_EVENT_ENABLED(BHV_TO_VNODE(bdp)->v_vfsp, ip, DM_EVENT_READ) && |
359 | (!(ioflags & IO_INVIS))) { | 359 | (!(ioflags & IO_INVIS))) { |
360 | vrwlock_t locktype = VRWLOCK_READ; | 360 | bhv_vrwlock_t locktype = VRWLOCK_READ; |
361 | int error; | 361 | int error; |
362 | 362 | ||
363 | error = XFS_SEND_DATA(mp, DM_EVENT_READ, BHV_TO_VNODE(bdp), | 363 | error = XFS_SEND_DATA(mp, DM_EVENT_READ, BHV_TO_VNODE(bdp), |
@@ -401,7 +401,7 @@ xfs_splice_write( | |||
401 | 401 | ||
402 | if (DM_EVENT_ENABLED(BHV_TO_VNODE(bdp)->v_vfsp, ip, DM_EVENT_WRITE) && | 402 | if (DM_EVENT_ENABLED(BHV_TO_VNODE(bdp)->v_vfsp, ip, DM_EVENT_WRITE) && |
403 | (!(ioflags & IO_INVIS))) { | 403 | (!(ioflags & IO_INVIS))) { |
404 | vrwlock_t locktype = VRWLOCK_WRITE; | 404 | bhv_vrwlock_t locktype = VRWLOCK_WRITE; |
405 | int error; | 405 | int error; |
406 | 406 | ||
407 | error = XFS_SEND_DATA(mp, DM_EVENT_WRITE, BHV_TO_VNODE(bdp), | 407 | error = XFS_SEND_DATA(mp, DM_EVENT_WRITE, BHV_TO_VNODE(bdp), |
@@ -630,7 +630,7 @@ xfs_write( | |||
630 | unsigned long seg; | 630 | unsigned long seg; |
631 | int iolock; | 631 | int iolock; |
632 | int eventsent = 0; | 632 | int eventsent = 0; |
633 | vrwlock_t locktype; | 633 | bhv_vrwlock_t locktype; |
634 | size_t ocount = 0, count; | 634 | size_t ocount = 0, count; |
635 | loff_t pos; | 635 | loff_t pos; |
636 | int need_i_mutex = 1, need_flush = 0; | 636 | int need_i_mutex = 1, need_flush = 0; |
diff --git a/fs/xfs/linux-2.6/xfs_vfs.c b/fs/xfs/linux-2.6/xfs_vfs.c index a91ecfa9c8aa..4fc884bcb4fd 100644 --- a/fs/xfs/linux-2.6/xfs_vfs.c +++ b/fs/xfs/linux-2.6/xfs_vfs.c | |||
@@ -117,7 +117,7 @@ vfs_root( | |||
117 | int | 117 | int |
118 | vfs_statvfs( | 118 | vfs_statvfs( |
119 | struct bhv_desc *bdp, | 119 | struct bhv_desc *bdp, |
120 | xfs_statfs_t *sp, | 120 | bhv_statvfs_t *statp, |
121 | struct bhv_vnode *vp) | 121 | struct bhv_vnode *vp) |
122 | { | 122 | { |
123 | struct bhv_desc *next = bdp; | 123 | struct bhv_desc *next = bdp; |
@@ -125,7 +125,7 @@ vfs_statvfs( | |||
125 | ASSERT(next); | 125 | ASSERT(next); |
126 | while (! (bhvtovfsops(next))->vfs_statvfs) | 126 | while (! (bhvtovfsops(next))->vfs_statvfs) |
127 | next = BHV_NEXT(next); | 127 | next = BHV_NEXT(next); |
128 | return ((*bhvtovfsops(next)->vfs_statvfs)(next, sp, vp)); | 128 | return ((*bhvtovfsops(next)->vfs_statvfs)(next, statp, vp)); |
129 | } | 129 | } |
130 | 130 | ||
131 | int | 131 | int |
diff --git a/fs/xfs/linux-2.6/xfs_vfs.h b/fs/xfs/linux-2.6/xfs_vfs.h index 1a3a2dd4b97e..7b88eeae0f26 100644 --- a/fs/xfs/linux-2.6/xfs_vfs.h +++ b/fs/xfs/linux-2.6/xfs_vfs.h | |||
@@ -23,14 +23,14 @@ | |||
23 | 23 | ||
24 | struct bhv_vfs; | 24 | struct bhv_vfs; |
25 | struct bhv_vnode; | 25 | struct bhv_vnode; |
26 | |||
26 | struct fid; | 27 | struct fid; |
27 | struct cred; | 28 | struct cred; |
28 | struct statfs; | ||
29 | struct seq_file; | 29 | struct seq_file; |
30 | struct super_block; | 30 | struct super_block; |
31 | struct xfs_mount_args; | 31 | struct xfs_mount_args; |
32 | 32 | ||
33 | typedef struct kstatfs xfs_statfs_t; | 33 | typedef struct kstatfs bhv_statvfs_t; |
34 | 34 | ||
35 | typedef struct bhv_vfs_sync_work { | 35 | typedef struct bhv_vfs_sync_work { |
36 | struct list_head w_list; | 36 | struct list_head w_list; |
@@ -109,7 +109,7 @@ typedef int (*vfs_unmount_t)(bhv_desc_t *, int, struct cred *); | |||
109 | typedef int (*vfs_mntupdate_t)(bhv_desc_t *, int *, | 109 | typedef int (*vfs_mntupdate_t)(bhv_desc_t *, int *, |
110 | struct xfs_mount_args *); | 110 | struct xfs_mount_args *); |
111 | typedef int (*vfs_root_t)(bhv_desc_t *, struct bhv_vnode **); | 111 | typedef int (*vfs_root_t)(bhv_desc_t *, struct bhv_vnode **); |
112 | typedef int (*vfs_statvfs_t)(bhv_desc_t *, xfs_statfs_t *, | 112 | typedef int (*vfs_statvfs_t)(bhv_desc_t *, bhv_statvfs_t *, |
113 | struct bhv_vnode *); | 113 | struct bhv_vnode *); |
114 | typedef int (*vfs_sync_t)(bhv_desc_t *, int, struct cred *); | 114 | typedef int (*vfs_sync_t)(bhv_desc_t *, int, struct cred *); |
115 | typedef int (*vfs_vget_t)(bhv_desc_t *, struct bhv_vnode **, struct fid *); | 115 | typedef int (*vfs_vget_t)(bhv_desc_t *, struct bhv_vnode **, struct fid *); |
@@ -181,7 +181,7 @@ extern int vfs_showargs(bhv_desc_t *, struct seq_file *); | |||
181 | extern int vfs_unmount(bhv_desc_t *, int, struct cred *); | 181 | extern int vfs_unmount(bhv_desc_t *, int, struct cred *); |
182 | extern int vfs_mntupdate(bhv_desc_t *, int *, struct xfs_mount_args *); | 182 | extern int vfs_mntupdate(bhv_desc_t *, int *, struct xfs_mount_args *); |
183 | extern int vfs_root(bhv_desc_t *, struct bhv_vnode **); | 183 | extern int vfs_root(bhv_desc_t *, struct bhv_vnode **); |
184 | extern int vfs_statvfs(bhv_desc_t *, xfs_statfs_t *, struct bhv_vnode *); | 184 | extern int vfs_statvfs(bhv_desc_t *, bhv_statvfs_t *, struct bhv_vnode *); |
185 | extern int vfs_sync(bhv_desc_t *, int, struct cred *); | 185 | extern int vfs_sync(bhv_desc_t *, int, struct cred *); |
186 | extern int vfs_vget(bhv_desc_t *, struct bhv_vnode **, struct fid *); | 186 | extern int vfs_vget(bhv_desc_t *, struct bhv_vnode **, struct fid *); |
187 | extern int vfs_dmapiops(bhv_desc_t *, caddr_t); | 187 | extern int vfs_dmapiops(bhv_desc_t *, caddr_t); |
diff --git a/fs/xfs/linux-2.6/xfs_vnode.c b/fs/xfs/linux-2.6/xfs_vnode.c index 66e36e195f29..6628d96b6fd6 100644 --- a/fs/xfs/linux-2.6/xfs_vnode.c +++ b/fs/xfs/linux-2.6/xfs_vnode.c | |||
@@ -111,7 +111,7 @@ vn_initialize( | |||
111 | void | 111 | void |
112 | vn_revalidate_core( | 112 | vn_revalidate_core( |
113 | bhv_vnode_t *vp, | 113 | bhv_vnode_t *vp, |
114 | vattr_t *vap) | 114 | bhv_vattr_t *vap) |
115 | { | 115 | { |
116 | struct inode *inode = vn_to_inode(vp); | 116 | struct inode *inode = vn_to_inode(vp); |
117 | 117 | ||
@@ -147,7 +147,7 @@ vn_revalidate_core( | |||
147 | int | 147 | int |
148 | __vn_revalidate( | 148 | __vn_revalidate( |
149 | bhv_vnode_t *vp, | 149 | bhv_vnode_t *vp, |
150 | struct vattr *vattr) | 150 | bhv_vattr_t *vattr) |
151 | { | 151 | { |
152 | int error; | 152 | int error; |
153 | 153 | ||
@@ -165,7 +165,7 @@ int | |||
165 | vn_revalidate( | 165 | vn_revalidate( |
166 | bhv_vnode_t *vp) | 166 | bhv_vnode_t *vp) |
167 | { | 167 | { |
168 | vattr_t vattr; | 168 | bhv_vattr_t vattr; |
169 | 169 | ||
170 | return __vn_revalidate(vp, &vattr); | 170 | return __vn_revalidate(vp, &vattr); |
171 | } | 171 | } |
diff --git a/fs/xfs/linux-2.6/xfs_vnode.h b/fs/xfs/linux-2.6/xfs_vnode.h index cb16774aea73..35c6a01963a7 100644 --- a/fs/xfs/linux-2.6/xfs_vnode.h +++ b/fs/xfs/linux-2.6/xfs_vnode.h | |||
@@ -20,29 +20,29 @@ | |||
20 | 20 | ||
21 | struct uio; | 21 | struct uio; |
22 | struct file; | 22 | struct file; |
23 | struct vattr; | 23 | struct bhv_vfs; |
24 | struct bhv_vattr; | ||
24 | struct xfs_iomap; | 25 | struct xfs_iomap; |
25 | struct attrlist_cursor_kern; | 26 | struct attrlist_cursor_kern; |
26 | 27 | ||
27 | typedef xfs_ino_t vnumber_t; | 28 | typedef struct dentry bhv_vname_t; |
28 | typedef struct dentry vname_t; | 29 | typedef __u64 bhv_vnumber_t; |
29 | typedef bhv_head_t vn_bhv_head_t; | ||
30 | 30 | ||
31 | typedef enum vflags { | 31 | typedef enum bhv_vflags { |
32 | VMODIFIED = 0x08, /* XFS inode state possibly differs */ | 32 | VMODIFIED = 0x08, /* XFS inode state possibly differs */ |
33 | /* to the Linux inode state. */ | 33 | /* to the Linux inode state. */ |
34 | VTRUNCATED = 0x40, /* truncated down so flush-on-close */ | 34 | VTRUNCATED = 0x40, /* truncated down so flush-on-close */ |
35 | } vflags_t; | 35 | } bhv_vflags_t; |
36 | 36 | ||
37 | /* | 37 | /* |
38 | * MP locking protocols: | 38 | * MP locking protocols: |
39 | * v_flag, v_vfsp VN_LOCK/VN_UNLOCK | 39 | * v_flag, v_vfsp VN_LOCK/VN_UNLOCK |
40 | */ | 40 | */ |
41 | typedef struct bhv_vnode { | 41 | typedef struct bhv_vnode { |
42 | vflags_t v_flag; /* vnode flags (see above) */ | 42 | bhv_vflags_t v_flag; /* vnode flags (see above) */ |
43 | struct bhv_vfs *v_vfsp; /* ptr to containing VFS */ | 43 | bhv_vfs_t *v_vfsp; /* ptr to containing VFS */ |
44 | vnumber_t v_number; /* in-core vnode number */ | 44 | bhv_vnumber_t v_number; /* in-core vnode number */ |
45 | vn_bhv_head_t v_bh; /* behavior head */ | 45 | bhv_head_t v_bh; /* behavior head */ |
46 | spinlock_t v_lock; /* VN_LOCK/VN_UNLOCK */ | 46 | spinlock_t v_lock; /* VN_LOCK/VN_UNLOCK */ |
47 | atomic_t v_iocount; /* outstanding I/O count */ | 47 | atomic_t v_iocount; /* outstanding I/O count */ |
48 | #ifdef XFS_VNODE_TRACE | 48 | #ifdef XFS_VNODE_TRACE |
@@ -103,14 +103,14 @@ static inline struct inode *vn_to_inode(struct bhv_vnode *vnode) | |||
103 | /* | 103 | /* |
104 | * Values for the vop_rwlock/rwunlock flags parameter. | 104 | * Values for the vop_rwlock/rwunlock flags parameter. |
105 | */ | 105 | */ |
106 | typedef enum vrwlock { | 106 | typedef enum bhv_vrwlock { |
107 | VRWLOCK_NONE, | 107 | VRWLOCK_NONE, |
108 | VRWLOCK_READ, | 108 | VRWLOCK_READ, |
109 | VRWLOCK_WRITE, | 109 | VRWLOCK_WRITE, |
110 | VRWLOCK_WRITE_DIRECT, | 110 | VRWLOCK_WRITE_DIRECT, |
111 | VRWLOCK_TRY_READ, | 111 | VRWLOCK_TRY_READ, |
112 | VRWLOCK_TRY_WRITE | 112 | VRWLOCK_TRY_WRITE |
113 | } vrwlock_t; | 113 | } bhv_vrwlock_t; |
114 | 114 | ||
115 | /* | 115 | /* |
116 | * Return values for bhv_vop_inactive. A return value of | 116 | * Return values for bhv_vop_inactive. A return value of |
@@ -123,13 +123,13 @@ typedef enum vrwlock { | |||
123 | /* | 123 | /* |
124 | * Values for the cmd code given to vop_vnode_change. | 124 | * Values for the cmd code given to vop_vnode_change. |
125 | */ | 125 | */ |
126 | typedef enum vchange { | 126 | typedef enum bhv_vchange { |
127 | VCHANGE_FLAGS_FRLOCKS = 0, | 127 | VCHANGE_FLAGS_FRLOCKS = 0, |
128 | VCHANGE_FLAGS_ENF_LOCKING = 1, | 128 | VCHANGE_FLAGS_ENF_LOCKING = 1, |
129 | VCHANGE_FLAGS_TRUNCATED = 2, | 129 | VCHANGE_FLAGS_TRUNCATED = 2, |
130 | VCHANGE_FLAGS_PAGE_DIRTY = 3, | 130 | VCHANGE_FLAGS_PAGE_DIRTY = 3, |
131 | VCHANGE_FLAGS_IOEXCL_COUNT = 4 | 131 | VCHANGE_FLAGS_IOEXCL_COUNT = 4 |
132 | } vchange_t; | 132 | } bhv_vchange_t; |
133 | 133 | ||
134 | typedef enum { L_FALSE, L_TRUE } lastclose_t; | 134 | typedef enum { L_FALSE, L_TRUE } lastclose_t; |
135 | 135 | ||
@@ -152,26 +152,26 @@ typedef ssize_t (*vop_splice_write_t)(bhv_desc_t *, struct pipe_inode_info *, | |||
152 | struct cred *); | 152 | struct cred *); |
153 | typedef int (*vop_ioctl_t)(bhv_desc_t *, struct inode *, struct file *, | 153 | typedef int (*vop_ioctl_t)(bhv_desc_t *, struct inode *, struct file *, |
154 | int, unsigned int, void __user *); | 154 | int, unsigned int, void __user *); |
155 | typedef int (*vop_getattr_t)(bhv_desc_t *, struct vattr *, int, | 155 | typedef int (*vop_getattr_t)(bhv_desc_t *, struct bhv_vattr *, int, |
156 | struct cred *); | 156 | struct cred *); |
157 | typedef int (*vop_setattr_t)(bhv_desc_t *, struct vattr *, int, | 157 | typedef int (*vop_setattr_t)(bhv_desc_t *, struct bhv_vattr *, int, |
158 | struct cred *); | 158 | struct cred *); |
159 | typedef int (*vop_access_t)(bhv_desc_t *, int, struct cred *); | 159 | typedef int (*vop_access_t)(bhv_desc_t *, int, struct cred *); |
160 | typedef int (*vop_lookup_t)(bhv_desc_t *, vname_t *, bhv_vnode_t **, | 160 | typedef int (*vop_lookup_t)(bhv_desc_t *, bhv_vname_t *, bhv_vnode_t **, |
161 | int, bhv_vnode_t *, struct cred *); | 161 | int, bhv_vnode_t *, struct cred *); |
162 | typedef int (*vop_create_t)(bhv_desc_t *, vname_t *, struct vattr *, | 162 | typedef int (*vop_create_t)(bhv_desc_t *, bhv_vname_t *, struct bhv_vattr *, |
163 | bhv_vnode_t **, struct cred *); | 163 | bhv_vnode_t **, struct cred *); |
164 | typedef int (*vop_remove_t)(bhv_desc_t *, vname_t *, struct cred *); | 164 | typedef int (*vop_remove_t)(bhv_desc_t *, bhv_vname_t *, struct cred *); |
165 | typedef int (*vop_link_t)(bhv_desc_t *, bhv_vnode_t *, vname_t *, | 165 | typedef int (*vop_link_t)(bhv_desc_t *, bhv_vnode_t *, bhv_vname_t *, |
166 | struct cred *); | 166 | struct cred *); |
167 | typedef int (*vop_rename_t)(bhv_desc_t *, vname_t *, bhv_vnode_t *, | 167 | typedef int (*vop_rename_t)(bhv_desc_t *, bhv_vname_t *, bhv_vnode_t *, |
168 | vname_t *, struct cred *); | 168 | bhv_vname_t *, struct cred *); |
169 | typedef int (*vop_mkdir_t)(bhv_desc_t *, vname_t *, struct vattr *, | 169 | typedef int (*vop_mkdir_t)(bhv_desc_t *, bhv_vname_t *, struct bhv_vattr *, |
170 | bhv_vnode_t **, struct cred *); | 170 | bhv_vnode_t **, struct cred *); |
171 | typedef int (*vop_rmdir_t)(bhv_desc_t *, vname_t *, struct cred *); | 171 | typedef int (*vop_rmdir_t)(bhv_desc_t *, bhv_vname_t *, struct cred *); |
172 | typedef int (*vop_readdir_t)(bhv_desc_t *, struct uio *, struct cred *, | 172 | typedef int (*vop_readdir_t)(bhv_desc_t *, struct uio *, struct cred *, |
173 | int *); | 173 | int *); |
174 | typedef int (*vop_symlink_t)(bhv_desc_t *, vname_t *, struct vattr *, | 174 | typedef int (*vop_symlink_t)(bhv_desc_t *, bhv_vname_t *, struct bhv_vattr*, |
175 | char *, bhv_vnode_t **, struct cred *); | 175 | char *, bhv_vnode_t **, struct cred *); |
176 | typedef int (*vop_readlink_t)(bhv_desc_t *, struct uio *, int, | 176 | typedef int (*vop_readlink_t)(bhv_desc_t *, struct uio *, int, |
177 | struct cred *); | 177 | struct cred *); |
@@ -180,8 +180,8 @@ typedef int (*vop_fsync_t)(bhv_desc_t *, int, struct cred *, | |||
180 | typedef int (*vop_inactive_t)(bhv_desc_t *, struct cred *); | 180 | typedef int (*vop_inactive_t)(bhv_desc_t *, struct cred *); |
181 | typedef int (*vop_fid2_t)(bhv_desc_t *, struct fid *); | 181 | typedef int (*vop_fid2_t)(bhv_desc_t *, struct fid *); |
182 | typedef int (*vop_release_t)(bhv_desc_t *); | 182 | typedef int (*vop_release_t)(bhv_desc_t *); |
183 | typedef int (*vop_rwlock_t)(bhv_desc_t *, vrwlock_t); | 183 | typedef int (*vop_rwlock_t)(bhv_desc_t *, bhv_vrwlock_t); |
184 | typedef void (*vop_rwunlock_t)(bhv_desc_t *, vrwlock_t); | 184 | typedef void (*vop_rwunlock_t)(bhv_desc_t *, bhv_vrwlock_t); |
185 | typedef int (*vop_bmap_t)(bhv_desc_t *, xfs_off_t, ssize_t, int, | 185 | typedef int (*vop_bmap_t)(bhv_desc_t *, xfs_off_t, ssize_t, int, |
186 | struct xfs_iomap *, int *); | 186 | struct xfs_iomap *, int *); |
187 | typedef int (*vop_reclaim_t)(bhv_desc_t *); | 187 | typedef int (*vop_reclaim_t)(bhv_desc_t *); |
@@ -194,7 +194,7 @@ typedef int (*vop_attr_remove_t)(bhv_desc_t *, const char *, | |||
194 | typedef int (*vop_attr_list_t)(bhv_desc_t *, char *, int, int, | 194 | typedef int (*vop_attr_list_t)(bhv_desc_t *, char *, int, int, |
195 | struct attrlist_cursor_kern *, struct cred *); | 195 | struct attrlist_cursor_kern *, struct cred *); |
196 | typedef void (*vop_link_removed_t)(bhv_desc_t *, bhv_vnode_t *, int); | 196 | typedef void (*vop_link_removed_t)(bhv_desc_t *, bhv_vnode_t *, int); |
197 | typedef void (*vop_vnode_change_t)(bhv_desc_t *, vchange_t, __psint_t); | 197 | typedef void (*vop_vnode_change_t)(bhv_desc_t *, bhv_vchange_t, __psint_t); |
198 | typedef void (*vop_ptossvp_t)(bhv_desc_t *, xfs_off_t, xfs_off_t, int); | 198 | typedef void (*vop_ptossvp_t)(bhv_desc_t *, xfs_off_t, xfs_off_t, int); |
199 | typedef void (*vop_pflushinvalvp_t)(bhv_desc_t *, xfs_off_t, xfs_off_t, int); | 199 | typedef void (*vop_pflushinvalvp_t)(bhv_desc_t *, xfs_off_t, xfs_off_t, int); |
200 | typedef int (*vop_pflushvp_t)(bhv_desc_t *, xfs_off_t, xfs_off_t, | 200 | typedef int (*vop_pflushvp_t)(bhv_desc_t *, xfs_off_t, xfs_off_t, |
@@ -346,7 +346,7 @@ typedef struct bhv_vnodeops { | |||
346 | * Vnode attributes. va_mask indicates those attributes the caller | 346 | * Vnode attributes. va_mask indicates those attributes the caller |
347 | * wants to set or extract. | 347 | * wants to set or extract. |
348 | */ | 348 | */ |
349 | typedef struct vattr { | 349 | typedef struct bhv_vattr { |
350 | int va_mask; /* bit-mask of attributes present */ | 350 | int va_mask; /* bit-mask of attributes present */ |
351 | mode_t va_mode; /* file access mode and type */ | 351 | mode_t va_mode; /* file access mode and type */ |
352 | xfs_nlink_t va_nlink; /* number of references to file */ | 352 | xfs_nlink_t va_nlink; /* number of references to file */ |
@@ -366,7 +366,7 @@ typedef struct vattr { | |||
366 | u_long va_nextents; /* number of extents in file */ | 366 | u_long va_nextents; /* number of extents in file */ |
367 | u_long va_anextents; /* number of attr extents in file */ | 367 | u_long va_anextents; /* number of attr extents in file */ |
368 | prid_t va_projid; /* project id */ | 368 | prid_t va_projid; /* project id */ |
369 | } vattr_t; | 369 | } bhv_vattr_t; |
370 | 370 | ||
371 | /* | 371 | /* |
372 | * setattr or getattr attributes | 372 | * setattr or getattr attributes |
@@ -442,8 +442,8 @@ typedef struct vattr { | |||
442 | extern void vn_init(void); | 442 | extern void vn_init(void); |
443 | extern bhv_vnode_t *vn_initialize(struct inode *); | 443 | extern bhv_vnode_t *vn_initialize(struct inode *); |
444 | extern int vn_revalidate(struct bhv_vnode *); | 444 | extern int vn_revalidate(struct bhv_vnode *); |
445 | extern int __vn_revalidate(struct bhv_vnode *, vattr_t *); | 445 | extern int __vn_revalidate(struct bhv_vnode *, bhv_vattr_t *); |
446 | extern void vn_revalidate_core(struct bhv_vnode *, vattr_t *); | 446 | extern void vn_revalidate_core(struct bhv_vnode *, bhv_vattr_t *); |
447 | 447 | ||
448 | extern void vn_iowait(struct bhv_vnode *vp); | 448 | extern void vn_iowait(struct bhv_vnode *vp); |
449 | extern void vn_iowake(struct bhv_vnode *vp); | 449 | extern void vn_iowake(struct bhv_vnode *vp); |
diff --git a/fs/xfs/quota/xfs_qm_bhv.c b/fs/xfs/quota/xfs_qm_bhv.c index ad9ab104946a..d93d3a1064ed 100644 --- a/fs/xfs/quota/xfs_qm_bhv.c +++ b/fs/xfs/quota/xfs_qm_bhv.c | |||
@@ -191,7 +191,7 @@ xfs_qm_mount( | |||
191 | STATIC int | 191 | STATIC int |
192 | xfs_qm_statvfs( | 192 | xfs_qm_statvfs( |
193 | struct bhv_desc *bhv, | 193 | struct bhv_desc *bhv, |
194 | xfs_statfs_t *statp, | 194 | bhv_statvfs_t *statp, |
195 | struct bhv_vnode *vnode) | 195 | struct bhv_vnode *vnode) |
196 | { | 196 | { |
197 | xfs_mount_t *mp; | 197 | xfs_mount_t *mp; |
diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c index 8c300da4e7ab..e1074955386f 100644 --- a/fs/xfs/xfs_acl.c +++ b/fs/xfs/xfs_acl.c | |||
@@ -241,7 +241,7 @@ xfs_acl_vget( | |||
241 | goto out; | 241 | goto out; |
242 | } | 242 | } |
243 | if (kind == _ACL_TYPE_ACCESS) { | 243 | if (kind == _ACL_TYPE_ACCESS) { |
244 | vattr_t va; | 244 | bhv_vattr_t va; |
245 | 245 | ||
246 | va.va_mask = XFS_AT_MODE; | 246 | va.va_mask = XFS_AT_MODE; |
247 | error = bhv_vop_getattr(vp, &va, 0, sys_cred); | 247 | error = bhv_vop_getattr(vp, &va, 0, sys_cred); |
@@ -373,7 +373,7 @@ xfs_acl_allow_set( | |||
373 | bhv_vnode_t *vp, | 373 | bhv_vnode_t *vp, |
374 | int kind) | 374 | int kind) |
375 | { | 375 | { |
376 | vattr_t va; | 376 | bhv_vattr_t va; |
377 | int error; | 377 | int error; |
378 | 378 | ||
379 | if (vp->v_inode.i_flags & (S_IMMUTABLE|S_APPEND)) | 379 | if (vp->v_inode.i_flags & (S_IMMUTABLE|S_APPEND)) |
@@ -666,7 +666,7 @@ xfs_acl_vtoacl( | |||
666 | xfs_acl_t *access_acl, | 666 | xfs_acl_t *access_acl, |
667 | xfs_acl_t *default_acl) | 667 | xfs_acl_t *default_acl) |
668 | { | 668 | { |
669 | vattr_t va; | 669 | bhv_vattr_t va; |
670 | int error = 0; | 670 | int error = 0; |
671 | 671 | ||
672 | if (access_acl) { | 672 | if (access_acl) { |
@@ -702,7 +702,7 @@ xfs_acl_vtoacl( | |||
702 | int | 702 | int |
703 | xfs_acl_inherit( | 703 | xfs_acl_inherit( |
704 | bhv_vnode_t *vp, | 704 | bhv_vnode_t *vp, |
705 | vattr_t *vap, | 705 | bhv_vattr_t *vap, |
706 | xfs_acl_t *pdaclp) | 706 | xfs_acl_t *pdaclp) |
707 | { | 707 | { |
708 | xfs_acl_t *cacl; | 708 | xfs_acl_t *cacl; |
@@ -761,7 +761,7 @@ xfs_acl_setmode( | |||
761 | xfs_acl_t *acl, | 761 | xfs_acl_t *acl, |
762 | int *basicperms) | 762 | int *basicperms) |
763 | { | 763 | { |
764 | vattr_t va; | 764 | bhv_vattr_t va; |
765 | xfs_acl_entry_t *ap; | 765 | xfs_acl_entry_t *ap; |
766 | xfs_acl_entry_t *gap = NULL; | 766 | xfs_acl_entry_t *gap = NULL; |
767 | int i, error, nomask = 1; | 767 | int i, error, nomask = 1; |
diff --git a/fs/xfs/xfs_acl.h b/fs/xfs/xfs_acl.h index a57ff4e6d39a..f853cf1a6270 100644 --- a/fs/xfs/xfs_acl.h +++ b/fs/xfs/xfs_acl.h | |||
@@ -58,7 +58,7 @@ extern struct kmem_zone *xfs_acl_zone; | |||
58 | (zone) = kmem_zone_init(sizeof(xfs_acl_t), (name)) | 58 | (zone) = kmem_zone_init(sizeof(xfs_acl_t), (name)) |
59 | #define xfs_acl_zone_destroy(zone) kmem_zone_destroy(zone) | 59 | #define xfs_acl_zone_destroy(zone) kmem_zone_destroy(zone) |
60 | 60 | ||
61 | extern int xfs_acl_inherit(struct bhv_vnode *, struct vattr *, xfs_acl_t *); | 61 | extern int xfs_acl_inherit(struct bhv_vnode *, struct bhv_vattr *, xfs_acl_t *); |
62 | extern int xfs_acl_iaccess(struct xfs_inode *, mode_t, cred_t *); | 62 | extern int xfs_acl_iaccess(struct xfs_inode *, mode_t, cred_t *); |
63 | extern int xfs_acl_vtoacl(struct bhv_vnode *, xfs_acl_t *, xfs_acl_t *); | 63 | extern int xfs_acl_vtoacl(struct bhv_vnode *, xfs_acl_t *, xfs_acl_t *); |
64 | extern int xfs_acl_vhasacl_access(struct bhv_vnode *); | 64 | extern int xfs_acl_vhasacl_access(struct bhv_vnode *); |
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index a70999063696..761f42f989cd 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h | |||
@@ -81,7 +81,7 @@ extern struct bhv_vnodeops xfs_vnodeops; | |||
81 | */ | 81 | */ |
82 | 82 | ||
83 | typedef int (*xfs_send_data_t)(int, struct bhv_vnode *, | 83 | typedef int (*xfs_send_data_t)(int, struct bhv_vnode *, |
84 | xfs_off_t, size_t, int, vrwlock_t *); | 84 | xfs_off_t, size_t, int, bhv_vrwlock_t *); |
85 | typedef int (*xfs_send_mmap_t)(struct vm_area_struct *, uint); | 85 | typedef int (*xfs_send_mmap_t)(struct vm_area_struct *, uint); |
86 | typedef int (*xfs_send_destroy_t)(struct bhv_vnode *, dm_right_t); | 86 | typedef int (*xfs_send_destroy_t)(struct bhv_vnode *, dm_right_t); |
87 | typedef int (*xfs_send_namesp_t)(dm_eventtype_t, struct bhv_vfs *, | 87 | typedef int (*xfs_send_namesp_t)(dm_eventtype_t, struct bhv_vfs *, |
diff --git a/fs/xfs/xfs_rename.c b/fs/xfs/xfs_rename.c index a20566b89121..7d5f9b6ffdb8 100644 --- a/fs/xfs/xfs_rename.c +++ b/fs/xfs/xfs_rename.c | |||
@@ -87,8 +87,8 @@ STATIC int | |||
87 | xfs_lock_for_rename( | 87 | xfs_lock_for_rename( |
88 | xfs_inode_t *dp1, /* old (source) directory inode */ | 88 | xfs_inode_t *dp1, /* old (source) directory inode */ |
89 | xfs_inode_t *dp2, /* new (target) directory inode */ | 89 | xfs_inode_t *dp2, /* new (target) directory inode */ |
90 | vname_t *vname1,/* old entry name */ | 90 | bhv_vname_t *vname1,/* old entry name */ |
91 | vname_t *vname2,/* new entry name */ | 91 | bhv_vname_t *vname2,/* new entry name */ |
92 | xfs_inode_t **ipp1, /* inode of old entry */ | 92 | xfs_inode_t **ipp1, /* inode of old entry */ |
93 | xfs_inode_t **ipp2, /* inode of new entry, if it | 93 | xfs_inode_t **ipp2, /* inode of new entry, if it |
94 | already exists, NULL otherwise. */ | 94 | already exists, NULL otherwise. */ |
@@ -225,9 +225,9 @@ xfs_lock_for_rename( | |||
225 | int | 225 | int |
226 | xfs_rename( | 226 | xfs_rename( |
227 | bhv_desc_t *src_dir_bdp, | 227 | bhv_desc_t *src_dir_bdp, |
228 | vname_t *src_vname, | 228 | bhv_vname_t *src_vname, |
229 | bhv_vnode_t *target_dir_vp, | 229 | bhv_vnode_t *target_dir_vp, |
230 | vname_t *target_vname, | 230 | bhv_vname_t *target_vname, |
231 | cred_t *credp) | 231 | cred_t *credp) |
232 | { | 232 | { |
233 | xfs_trans_t *tp; | 233 | xfs_trans_t *tp; |
diff --git a/fs/xfs/xfs_rw.h b/fs/xfs/xfs_rw.h index e63795644478..a572b175dc8b 100644 --- a/fs/xfs/xfs_rw.h +++ b/fs/xfs/xfs_rw.h | |||
@@ -87,9 +87,10 @@ extern void xfs_ioerror_alert(char *func, struct xfs_mount *mp, | |||
87 | /* | 87 | /* |
88 | * Prototypes for functions in xfs_vnodeops.c. | 88 | * Prototypes for functions in xfs_vnodeops.c. |
89 | */ | 89 | */ |
90 | extern int xfs_rwlock(bhv_desc_t *bdp, vrwlock_t write_lock); | 90 | extern int xfs_rwlock(bhv_desc_t *bdp, bhv_vrwlock_t write_lock); |
91 | extern void xfs_rwunlock(bhv_desc_t *bdp, vrwlock_t write_lock); | 91 | extern void xfs_rwunlock(bhv_desc_t *bdp, bhv_vrwlock_t write_lock); |
92 | extern int xfs_setattr(bhv_desc_t *bdp, vattr_t *vap, int flags, cred_t *credp); | 92 | extern int xfs_setattr(bhv_desc_t *, bhv_vattr_t *vap, int flags, |
93 | cred_t *credp); | ||
93 | extern int xfs_change_file_space(bhv_desc_t *bdp, int cmd, xfs_flock64_t *bf, | 94 | extern int xfs_change_file_space(bhv_desc_t *bdp, int cmd, xfs_flock64_t *bf, |
94 | xfs_off_t offset, cred_t *credp, int flags); | 95 | xfs_off_t offset, cred_t *credp, int flags); |
95 | extern int xfs_set_dmattrs(bhv_desc_t *bdp, u_int evmask, u_int16_t state, | 96 | extern int xfs_set_dmattrs(bhv_desc_t *bdp, u_int evmask, u_int16_t state, |
diff --git a/fs/xfs/xfs_utils.c b/fs/xfs/xfs_utils.c index 6ecc0ca58681..37fdc2dc00b4 100644 --- a/fs/xfs/xfs_utils.c +++ b/fs/xfs/xfs_utils.c | |||
@@ -51,7 +51,7 @@ | |||
51 | */ | 51 | */ |
52 | int | 52 | int |
53 | xfs_get_dir_entry( | 53 | xfs_get_dir_entry( |
54 | vname_t *dentry, | 54 | bhv_vname_t *dentry, |
55 | xfs_inode_t **ipp) | 55 | xfs_inode_t **ipp) |
56 | { | 56 | { |
57 | bhv_vnode_t *vp; | 57 | bhv_vnode_t *vp; |
@@ -69,7 +69,7 @@ int | |||
69 | xfs_dir_lookup_int( | 69 | xfs_dir_lookup_int( |
70 | bhv_desc_t *dir_bdp, | 70 | bhv_desc_t *dir_bdp, |
71 | uint lock_mode, | 71 | uint lock_mode, |
72 | vname_t *dentry, | 72 | bhv_vname_t *dentry, |
73 | xfs_ino_t *inum, | 73 | xfs_ino_t *inum, |
74 | xfs_inode_t **ipp) | 74 | xfs_inode_t **ipp) |
75 | { | 75 | { |
diff --git a/fs/xfs/xfs_utils.h b/fs/xfs/xfs_utils.h index cecf1031059b..fe953e98afa7 100644 --- a/fs/xfs/xfs_utils.h +++ b/fs/xfs/xfs_utils.h | |||
@@ -23,10 +23,10 @@ | |||
23 | #define ITRACE(ip) vn_trace_ref(XFS_ITOV(ip), __FILE__, __LINE__, \ | 23 | #define ITRACE(ip) vn_trace_ref(XFS_ITOV(ip), __FILE__, __LINE__, \ |
24 | (inst_t *)__return_address) | 24 | (inst_t *)__return_address) |
25 | 25 | ||
26 | extern int xfs_rename (bhv_desc_t *, vname_t *, bhv_vnode_t *, | 26 | extern int xfs_rename (bhv_desc_t *, bhv_vname_t *, bhv_vnode_t *, |
27 | vname_t *, cred_t *); | 27 | bhv_vname_t *, cred_t *); |
28 | extern int xfs_get_dir_entry (vname_t *, xfs_inode_t **); | 28 | extern int xfs_get_dir_entry (bhv_vname_t *, xfs_inode_t **); |
29 | extern int xfs_dir_lookup_int (bhv_desc_t *, uint, vname_t *, xfs_ino_t *, | 29 | extern int xfs_dir_lookup_int (bhv_desc_t *, uint, bhv_vname_t *, xfs_ino_t *, |
30 | xfs_inode_t **); | 30 | xfs_inode_t **); |
31 | extern int xfs_truncate_file (xfs_mount_t *, xfs_inode_t *); | 31 | extern int xfs_truncate_file (xfs_mount_t *, xfs_inode_t *); |
32 | extern int xfs_dir_ialloc (xfs_trans_t **, xfs_inode_t *, mode_t, xfs_nlink_t, | 32 | extern int xfs_dir_ialloc (xfs_trans_t **, xfs_inode_t *, mode_t, xfs_nlink_t, |
diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c index d3f270a62c9f..7550583bd096 100644 --- a/fs/xfs/xfs_vfsops.c +++ b/fs/xfs/xfs_vfsops.c | |||
@@ -800,7 +800,7 @@ xfs_root( | |||
800 | STATIC int | 800 | STATIC int |
801 | xfs_statvfs( | 801 | xfs_statvfs( |
802 | bhv_desc_t *bdp, | 802 | bhv_desc_t *bdp, |
803 | xfs_statfs_t *statp, | 803 | bhv_statvfs_t *statp, |
804 | bhv_vnode_t *vp) | 804 | bhv_vnode_t *vp) |
805 | { | 805 | { |
806 | __uint64_t fakeinos; | 806 | __uint64_t fakeinos; |
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index f3c2deeed0a3..26d96d1b25cd 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c | |||
@@ -117,7 +117,7 @@ xfs_close( | |||
117 | STATIC int | 117 | STATIC int |
118 | xfs_getattr( | 118 | xfs_getattr( |
119 | bhv_desc_t *bdp, | 119 | bhv_desc_t *bdp, |
120 | vattr_t *vap, | 120 | bhv_vattr_t *vap, |
121 | int flags, | 121 | int flags, |
122 | cred_t *credp) | 122 | cred_t *credp) |
123 | { | 123 | { |
@@ -250,7 +250,7 @@ xfs_getattr( | |||
250 | int | 250 | int |
251 | xfs_setattr( | 251 | xfs_setattr( |
252 | bhv_desc_t *bdp, | 252 | bhv_desc_t *bdp, |
253 | vattr_t *vap, | 253 | bhv_vattr_t *vap, |
254 | int flags, | 254 | int flags, |
255 | cred_t *credp) | 255 | cred_t *credp) |
256 | { | 256 | { |
@@ -1815,7 +1815,7 @@ xfs_inactive( | |||
1815 | STATIC int | 1815 | STATIC int |
1816 | xfs_lookup( | 1816 | xfs_lookup( |
1817 | bhv_desc_t *dir_bdp, | 1817 | bhv_desc_t *dir_bdp, |
1818 | vname_t *dentry, | 1818 | bhv_vname_t *dentry, |
1819 | bhv_vnode_t **vpp, | 1819 | bhv_vnode_t **vpp, |
1820 | int flags, | 1820 | int flags, |
1821 | bhv_vnode_t *rdir, | 1821 | bhv_vnode_t *rdir, |
@@ -1852,8 +1852,8 @@ xfs_lookup( | |||
1852 | STATIC int | 1852 | STATIC int |
1853 | xfs_create( | 1853 | xfs_create( |
1854 | bhv_desc_t *dir_bdp, | 1854 | bhv_desc_t *dir_bdp, |
1855 | vname_t *dentry, | 1855 | bhv_vname_t *dentry, |
1856 | vattr_t *vap, | 1856 | bhv_vattr_t *vap, |
1857 | bhv_vnode_t **vpp, | 1857 | bhv_vnode_t **vpp, |
1858 | cred_t *credp) | 1858 | cred_t *credp) |
1859 | { | 1859 | { |
@@ -2127,7 +2127,7 @@ int xfs_rm_attempts; | |||
2127 | STATIC int | 2127 | STATIC int |
2128 | xfs_lock_dir_and_entry( | 2128 | xfs_lock_dir_and_entry( |
2129 | xfs_inode_t *dp, | 2129 | xfs_inode_t *dp, |
2130 | vname_t *dentry, | 2130 | bhv_vname_t *dentry, |
2131 | xfs_inode_t *ip) /* inode of entry 'name' */ | 2131 | xfs_inode_t *ip) /* inode of entry 'name' */ |
2132 | { | 2132 | { |
2133 | int attempts; | 2133 | int attempts; |
@@ -2341,7 +2341,7 @@ int remove_which_error_return = 0; | |||
2341 | STATIC int | 2341 | STATIC int |
2342 | xfs_remove( | 2342 | xfs_remove( |
2343 | bhv_desc_t *dir_bdp, | 2343 | bhv_desc_t *dir_bdp, |
2344 | vname_t *dentry, | 2344 | bhv_vname_t *dentry, |
2345 | cred_t *credp) | 2345 | cred_t *credp) |
2346 | { | 2346 | { |
2347 | bhv_vnode_t *dir_vp; | 2347 | bhv_vnode_t *dir_vp; |
@@ -2585,7 +2585,7 @@ STATIC int | |||
2585 | xfs_link( | 2585 | xfs_link( |
2586 | bhv_desc_t *target_dir_bdp, | 2586 | bhv_desc_t *target_dir_bdp, |
2587 | bhv_vnode_t *src_vp, | 2587 | bhv_vnode_t *src_vp, |
2588 | vname_t *dentry, | 2588 | bhv_vname_t *dentry, |
2589 | cred_t *credp) | 2589 | cred_t *credp) |
2590 | { | 2590 | { |
2591 | xfs_inode_t *tdp, *sip; | 2591 | xfs_inode_t *tdp, *sip; |
@@ -2754,8 +2754,8 @@ std_return: | |||
2754 | STATIC int | 2754 | STATIC int |
2755 | xfs_mkdir( | 2755 | xfs_mkdir( |
2756 | bhv_desc_t *dir_bdp, | 2756 | bhv_desc_t *dir_bdp, |
2757 | vname_t *dentry, | 2757 | bhv_vname_t *dentry, |
2758 | vattr_t *vap, | 2758 | bhv_vattr_t *vap, |
2759 | bhv_vnode_t **vpp, | 2759 | bhv_vnode_t **vpp, |
2760 | cred_t *credp) | 2760 | cred_t *credp) |
2761 | { | 2761 | { |
@@ -2989,7 +2989,7 @@ std_return: | |||
2989 | STATIC int | 2989 | STATIC int |
2990 | xfs_rmdir( | 2990 | xfs_rmdir( |
2991 | bhv_desc_t *dir_bdp, | 2991 | bhv_desc_t *dir_bdp, |
2992 | vname_t *dentry, | 2992 | bhv_vname_t *dentry, |
2993 | cred_t *credp) | 2993 | cred_t *credp) |
2994 | { | 2994 | { |
2995 | char *name = VNAME(dentry); | 2995 | char *name = VNAME(dentry); |
@@ -3268,8 +3268,8 @@ xfs_readdir( | |||
3268 | STATIC int | 3268 | STATIC int |
3269 | xfs_symlink( | 3269 | xfs_symlink( |
3270 | bhv_desc_t *dir_bdp, | 3270 | bhv_desc_t *dir_bdp, |
3271 | vname_t *dentry, | 3271 | bhv_vname_t *dentry, |
3272 | vattr_t *vap, | 3272 | bhv_vattr_t *vap, |
3273 | char *target_path, | 3273 | char *target_path, |
3274 | bhv_vnode_t **vpp, | 3274 | bhv_vnode_t **vpp, |
3275 | cred_t *credp) | 3275 | cred_t *credp) |
@@ -3626,7 +3626,7 @@ xfs_fid2( | |||
3626 | int | 3626 | int |
3627 | xfs_rwlock( | 3627 | xfs_rwlock( |
3628 | bhv_desc_t *bdp, | 3628 | bhv_desc_t *bdp, |
3629 | vrwlock_t locktype) | 3629 | bhv_vrwlock_t locktype) |
3630 | { | 3630 | { |
3631 | xfs_inode_t *ip; | 3631 | xfs_inode_t *ip; |
3632 | bhv_vnode_t *vp; | 3632 | bhv_vnode_t *vp; |
@@ -3657,7 +3657,7 @@ xfs_rwlock( | |||
3657 | void | 3657 | void |
3658 | xfs_rwunlock( | 3658 | xfs_rwunlock( |
3659 | bhv_desc_t *bdp, | 3659 | bhv_desc_t *bdp, |
3660 | vrwlock_t locktype) | 3660 | bhv_vrwlock_t locktype) |
3661 | { | 3661 | { |
3662 | xfs_inode_t *ip; | 3662 | xfs_inode_t *ip; |
3663 | bhv_vnode_t *vp; | 3663 | bhv_vnode_t *vp; |
@@ -4502,7 +4502,7 @@ xfs_change_file_space( | |||
4502 | xfs_off_t startoffset; | 4502 | xfs_off_t startoffset; |
4503 | xfs_off_t llen; | 4503 | xfs_off_t llen; |
4504 | xfs_trans_t *tp; | 4504 | xfs_trans_t *tp; |
4505 | vattr_t va; | 4505 | bhv_vattr_t va; |
4506 | bhv_vnode_t *vp; | 4506 | bhv_vnode_t *vp; |
4507 | 4507 | ||
4508 | vp = BHV_TO_VNODE(bdp); | 4508 | vp = BHV_TO_VNODE(bdp); |