diff options
| author | Brian Behlendorf <[email protected]> | 2011-01-11 11:46:49 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2011-01-12 11:38:05 -0800 |
| commit | 647fa73cf33930f36259d00fd86c52b8e8113c30 (patch) | |
| tree | 34459dbb83ed7183bab0e5954cb4567e7997f606 | |
| parent | bd6ac72b03701a3f37e6c8e706cec16192f873cd (diff) | |
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.
| -rw-r--r-- | include/sys/vnode.h | 15 | ||||
| -rw-r--r-- | module/spl/spl-kobj.c | 1 | ||||
| -rw-r--r-- | module/splat/splat-vnode.c | 7 |
3 files changed, 1 insertions, 22 deletions
diff --git a/include/sys/vnode.h b/include/sys/vnode.h index e43d9ef62..d017506ba 100644 --- a/include/sys/vnode.h +++ b/include/sys/vnode.h @@ -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 diff --git a/module/spl/spl-kobj.c b/module/spl/spl-kobj.c index 226a12971..684d57226 100644 --- a/module/spl/spl-kobj.c +++ b/module/spl/spl-kobj.c @@ -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() */ diff --git a/module/splat/splat-vnode.c b/module/splat/splat-vnode.c index 1955841e2..0cd28a690 100644 --- a/module/splat/splat-vnode.c +++ b/module/splat/splat-vnode.c @@ -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; |