diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 11:55:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 11:55:50 -0700 |
| commit | f768f9d3757be475a20cb5f9d63bda45934150b1 (patch) | |
| tree | b9e5ab5ba84c8434a702723ab80ac6f0f990ce23 /fs/xfs/xfs_vfsops.h | |
| parent | 804b908adfcffe3831621acb6c8a776585983d2a (diff) | |
| parent | c6143911a7e0f8abef0319c801eb36718f57dfde (diff) | |
| download | op-kernel-dev-f768f9d3757be475a20cb5f9d63bda45934150b1.zip op-kernel-dev-f768f9d3757be475a20cb5f9d63bda45934150b1.tar.gz | |
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
[XFS] cleanup fid types mess
[XFS] fixups after behavior removal merge into mainline git
Diffstat (limited to 'fs/xfs/xfs_vfsops.h')
| -rw-r--r-- | fs/xfs/xfs_vfsops.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_vfsops.h b/fs/xfs/xfs_vfsops.h index bc99e3e..a592fe0 100644 --- a/fs/xfs/xfs_vfsops.h +++ b/fs/xfs/xfs_vfsops.h @@ -2,7 +2,7 @@ #define _XFS_VFSOPS_H 1 struct cred; -struct fid; +struct xfs_fid; struct inode; struct kstatfs; struct xfs_mount; @@ -17,7 +17,7 @@ int xfs_root(struct xfs_mount *mp, bhv_vnode_t **vpp); int xfs_statvfs(struct xfs_mount *mp, struct kstatfs *statp, bhv_vnode_t *vp); int xfs_sync(struct xfs_mount *mp, int flags); -int xfs_vget(struct xfs_mount *mp, bhv_vnode_t **vpp, struct fid *fidp); +int xfs_vget(struct xfs_mount *mp, bhv_vnode_t **vpp, struct xfs_fid *xfid); int xfs_parseargs(struct xfs_mount *mp, char *options, struct xfs_mount_args *args, int update); int xfs_showargs(struct xfs_mount *mp, struct seq_file *m); |
