diff options
Diffstat (limited to 'sys/fs')
| -rw-r--r-- | sys/fs/msdosfs/denode.h | 1 | ||||
| -rw-r--r-- | sys/fs/msdosfs/msdosfs_vnops.c | 35 | ||||
| -rw-r--r-- | sys/fs/smbfs/smbfs_node.h | 1 | ||||
| -rw-r--r-- | sys/fs/smbfs/smbfs_vnops.c | 8 | ||||
| -rw-r--r-- | sys/fs/tmpfs/tmpfs.h | 3 | ||||
| -rw-r--r-- | sys/fs/tmpfs/tmpfs_vfsops.c | 1 | ||||
| -rw-r--r-- | sys/fs/tmpfs/tmpfs_vnops.c | 32 |
7 files changed, 4 insertions, 77 deletions
diff --git a/sys/fs/msdosfs/denode.h b/sys/fs/msdosfs/denode.h index fbd95aa..4e03e9a 100644 --- a/sys/fs/msdosfs/denode.h +++ b/sys/fs/msdosfs/denode.h @@ -159,7 +159,6 @@ struct denode { u_long de_FileSize; /* size of file in bytes */ struct fatcache de_fc[FC_SIZE]; /* fat cache */ u_quad_t de_modrev; /* Revision level for lease. */ - struct lockf *de_lockf; /* lockf */ u_int64_t de_inode; /* Inode number (really byte offset of direntry) */ }; diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 7a89f7b..8a1484f 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -82,8 +82,6 @@ /* * Prototypes for MSDOSFS vnode operations */ -static vop_advlock_t msdosfs_advlock; -static vop_advlockasync_t msdosfs_advlockasync; static vop_create_t msdosfs_create; static vop_mknod_t msdosfs_mknod; static vop_open_t msdosfs_open; @@ -1949,37 +1947,6 @@ msdosfs_pathconf(ap) } static int -msdosfs_advlock(ap) - struct vop_advlock_args /* { - struct vnode *a_vp; - u_char a_id; - int a_op; - struct flock *a_fl; - int a_flags; - } */ *ap; -{ - struct denode *dep = VTODE(ap->a_vp); - - return (lf_advlock(ap, &dep->de_lockf, dep->de_FileSize)); -} - -static int -msdosfs_advlockasync(ap) - struct vop_advlockasync_args /* { - struct vnode *a_vp; - u_char a_id; - int a_op; - struct flock *a_fl; - int a_flags; - struct task *a_task; - } */ *ap; -{ - struct denode *dep = VTODE(ap->a_vp); - - return (lf_advlockasync(ap, &dep->de_lockf, dep->de_FileSize)); -} - -static int msdosfs_vptofh(ap) struct vop_vptofh_args /* { struct vnode *a_vp; @@ -2003,8 +1970,6 @@ struct vop_vector msdosfs_vnodeops = { .vop_default = &default_vnodeops, .vop_access = msdosfs_access, - .vop_advlock = msdosfs_advlock, - .vop_advlockasync = msdosfs_advlockasync, .vop_bmap = msdosfs_bmap, .vop_cachedlookup = msdosfs_lookup, .vop_open = msdosfs_open, diff --git a/sys/fs/smbfs/smbfs_node.h b/sys/fs/smbfs/smbfs_node.h index 4e92393..f9c08cf 100644 --- a/sys/fs/smbfs/smbfs_node.h +++ b/sys/fs/smbfs/smbfs_node.h @@ -66,7 +66,6 @@ struct smbnode { u_char * n_name; struct smbfs_fctx * n_dirseq; /* ff context */ long n_dirofs; /* last ff offset */ - struct lockf * n_lockf; /* Locking records of file */ LIST_ENTRY(smbnode) n_hash; }; diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c index 4d5f454..f7ca806 100644 --- a/sys/fs/smbfs/smbfs_vnops.c +++ b/sys/fs/smbfs/smbfs_vnops.c @@ -1008,7 +1008,7 @@ smbfs_advlock(ap) default: return EINVAL; } - error = lf_advlock(ap, &np->n_lockf, size); + error = lf_advlock(ap, &vp->v_lockf, size); if (error) break; lkop = SMB_LOCK_EXCL; @@ -1017,16 +1017,16 @@ smbfs_advlock(ap) int oldtype = fl->l_type; fl->l_type = F_UNLCK; ap->a_op = F_UNLCK; - lf_advlock(ap, &np->n_lockf, size); + lf_advlock(ap, &vp->v_lockf, size); fl->l_type = oldtype; } break; case F_UNLCK: - lf_advlock(ap, &np->n_lockf, size); + lf_advlock(ap, &vp->v_lockf, size); error = smbfs_smb_lock(np, SMB_LOCK_RELEASE, id, start, end, &scred); break; case F_GETLK: - error = lf_advlock(ap, &np->n_lockf, size); + error = lf_advlock(ap, &vp->v_lockf, size); break; default: return EINVAL; diff --git a/sys/fs/tmpfs/tmpfs.h b/sys/fs/tmpfs/tmpfs.h index d730e9e..fd0001e 100644 --- a/sys/fs/tmpfs/tmpfs.h +++ b/sys/fs/tmpfs/tmpfs.h @@ -219,9 +219,6 @@ struct tmpfs_node { struct timespec tn_birthtime; unsigned long tn_gen; - /* Head of byte-level lock list (used by tmpfs_advlock). */ - struct lockf * tn_lockf; - /* As there is a single vnode for each active file within the * system, care has to be taken to avoid allocating more than one * vnode per file. In order to do this, a bidirectional association diff --git a/sys/fs/tmpfs/tmpfs_vfsops.c b/sys/fs/tmpfs/tmpfs_vfsops.c index b5fbd3c..a14558b 100644 --- a/sys/fs/tmpfs/tmpfs_vfsops.c +++ b/sys/fs/tmpfs/tmpfs_vfsops.c @@ -151,7 +151,6 @@ tmpfs_node_ctor(void *mem, int size, void *arg, int flags) node->tn_status = 0; node->tn_flags = 0; node->tn_links = 0; - node->tn_lockf = NULL; node->tn_vnode = NULL; node->tn_vpstate = 0; diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index f50af94..719a5de 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -1429,36 +1429,6 @@ tmpfs_pathconf(struct vop_pathconf_args *v) return error; } -/* --------------------------------------------------------------------- */ - -static int -tmpfs_advlock(struct vop_advlock_args *v) -{ - struct vnode *vp = v->a_vp; - - struct tmpfs_node *node; - - node = VP_TO_TMPFS_NODE(vp); - - return lf_advlock(v, &node->tn_lockf, node->tn_size); -} - -/* --------------------------------------------------------------------- */ - -static int -tmpfs_advlockasync(struct vop_advlockasync_args *v) -{ - struct vnode *vp = v->a_vp; - - struct tmpfs_node *node; - - node = VP_TO_TMPFS_NODE(vp); - - return lf_advlockasync(v, &node->tn_lockf, node->tn_size); -} - -/* --------------------------------------------------------------------- */ - static int tmpfs_vptofh(struct vop_vptofh_args *ap) { @@ -1506,8 +1476,6 @@ struct vop_vector tmpfs_vnodeop_entries = { .vop_reclaim = tmpfs_reclaim, .vop_print = tmpfs_print, .vop_pathconf = tmpfs_pathconf, - .vop_advlock = tmpfs_advlock, - .vop_advlockasync = tmpfs_advlockasync, .vop_vptofh = tmpfs_vptofh, .vop_bmap = VOP_EOPNOTSUPP, }; |
