Return to xfs_vnode.h CVS log

Up to [Development] / linux-2.6-xfs / mainline-patches / linux-2.6

Merge of 2.6.x-xfs-melb:linux:27935a by kenmcd.

  Reinstate delete file.

frlock needed for ioops module.

--- /tmp/diff_prompt.12865.update_only	2006-12-15 22:52:42.607136550 +1100
+++ linux-2.6/xfs_vnode.h	2006-12-15 17:48:29.000000000 +1100
@@ -180,6 +180,8 @@
 typedef int	(*vop_release_t)(bhv_desc_t *);
 typedef int	(*vop_rwlock_t)(bhv_desc_t *, bhv_vrwlock_t);
 typedef void	(*vop_rwunlock_t)(bhv_desc_t *, bhv_vrwlock_t);
+typedef	int	(*vop_frlock_t)(bhv_desc_t *, int, struct file_lock *,int,
+				xfs_off_t, struct cred *);
 typedef int	(*vop_bmap_t)(bhv_desc_t *, xfs_off_t, ssize_t, int,
 				struct xfs_iomap *, int *);
 typedef int	(*vop_reclaim_t)(bhv_desc_t *);
@@ -228,6 +230,7 @@
 	vop_fid2_t		vop_fid2;
 	vop_rwlock_t		vop_rwlock;
 	vop_rwunlock_t		vop_rwunlock;
+	vop_frlock_t		vop_frlock;
 	vop_bmap_t		vop_bmap;
 	vop_reclaim_t		vop_reclaim;
 	vop_attr_get_t		vop_attr_get;