Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Remove VN_HOLD/VN_RELE/VOP_PUTPAGE 

Previously these were defined to noops but rather than give
the misleading impression that these are actually implemented
I'm removing the type entirely for clarity.
This commit is contained in:
Brian Behlendorf 2011-01-11 11:46:49 -08:00
parent bd6ac72b03
commit 647fa73cf3
3 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/sys/vnode.h
View File

@ -234,24 +234,11 @@ extern int vn_set_pwd(const char *filename);
int vn_init(void);
void vn_fini(void);
static __inline__ int
vn_rele(vnode_t *vp)
{
return 0;
} /* vn_rele() */
static __inline__ int
vn_putpage(vnode_t *vp, offset_t off, ssize_t size,
int flags, void *x1, void *x2) {
return 0;
} /* vn_putpage() */
#define VOP_CLOSE vn_close
#define VOP_SEEK vn_seek
#define VN_RELE vn_rele
#define VOP_GETATTR vn_getattr
#define VOP_FSYNC vn_fsync
#define VOP_PUTPAGE vn_putpage
#define VOP_PUTPAGE(vp, o, s, f, x1, x2) ((void)0)
#define vn_is_readonly(vp) 0
#define getf vn_getf
#define releasef vn_releasef

1
module/spl/spl-kobj.c
View File

@ -61,7 +61,6 @@ kobj_close_file(struct _buf *file)
{
SENTRY;
VOP_CLOSE(file->vp, 0, 0, 0, 0, 0);
VN_RELE(file->vp);
kfree(file);
SEXIT;
} /* kobj_close_file() */

7
module/splat/splat-vnode.c
View File

@ -124,7 +124,6 @@ splat_vnode_test1(struct file *file, void *arg)
}
rc = VOP_CLOSE(vp, 0, 0, 0, 0, 0);
VN_RELE(vp);
if (rc) {
splat_vprint(file, SPLAT_VNODE_TEST1_NAME,
@ -154,7 +153,6 @@ splat_vnode_test2(struct file *file, void *arg)
}
rc = VOP_CLOSE(vp, 0, 0, 0, 0, 0);
VN_RELE(vp);
if (rc) {
splat_vprint(file, SPLAT_VNODE_TEST2_NAME,
@ -224,7 +222,6 @@ splat_vnode_test3(struct file *file, void *arg)
out:
VOP_CLOSE(vp, 0, 0, 0, 0, 0);
VN_RELE(vp);
vn_remove(SPLAT_VNODE_TEST_FILE_RW, UIO_SYSSPACE, RMFILE);
return -rc;
@ -259,7 +256,6 @@ splat_vnode_test4(struct file *file, void *arg)
}
VOP_CLOSE(vp, 0, 0, 0, 0, 0);
VN_RELE(vp);
rc = vn_rename(SPLAT_VNODE_TEST_FILE_RW1,SPLAT_VNODE_TEST_FILE_RW2,0);
if (rc) {
@ -305,7 +301,6 @@ splat_vnode_test4(struct file *file, void *arg)
SPLAT_VNODE_TEST_FILE_RW1, SPLAT_VNODE_TEST_FILE_RW2);
out2:
VOP_CLOSE(vp, 0, 0, 0, 0, 0);
VN_RELE(vp);
out:
vn_remove(SPLAT_VNODE_TEST_FILE_RW1, UIO_SYSSPACE, RMFILE);
vn_remove(SPLAT_VNODE_TEST_FILE_RW2, UIO_SYSSPACE, RMFILE);
@ -350,7 +345,6 @@ splat_vnode_test5(struct file *file, void *arg)
out:
VOP_CLOSE(vp, 0, 0, 0, 0, 0);
VN_RELE(vp);
return -rc;
} /* splat_vnode_test5() */
@ -395,7 +389,6 @@ splat_vnode_test6(struct file *file, void *arg)
"fsync'ed test file %s\n", SPLAT_VNODE_TEST_FILE_RW);
out:
VOP_CLOSE(vp, 0, 0, 0, 0, 0);
VN_RELE(vp);
vn_remove(SPLAT_VNODE_TEST_FILE_RW, UIO_SYSSPACE, RMFILE);
return -rc;