git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
fs
/
xfs
/
linux-2.6
/
xfs_super.h
diff --git
a/fs/xfs/linux-2.6/xfs_super.h
b/fs/xfs/linux-2.6/xfs_super.h
index
df59408
..
33dd1ca
100644
(file)
--- a/
fs/xfs/linux-2.6/xfs_super.h
+++ b/
fs/xfs/linux-2.6/xfs_super.h
@@
-98,11
+98,6
@@
extern void xfs_qm_exit(void);
XFS_DMAPI_STRING \
XFS_DBG_STRING /* DBG must be last */
XFS_DMAPI_STRING \
XFS_DBG_STRING /* DBG must be last */
-#define LINVFS_GET_VFS(s) \
- (vfs_t *)((s)->s_fs_info)
-#define LINVFS_SET_VFS(s, vfsp) \
- ((s)->s_fs_info = vfsp)
-
struct xfs_inode;
struct xfs_mount;
struct xfs_buftarg;
struct xfs_inode;
struct xfs_mount;
struct xfs_buftarg;
@@
-110,7
+105,7
@@
struct block_device;
extern __uint64_t xfs_max_file_offset(unsigned int);
extern __uint64_t xfs_max_file_offset(unsigned int);
-extern void xfs_initialize_vnode(bhv_desc_t *, vnode_t *, bhv_desc_t *, int);
+extern void xfs_initialize_vnode(bhv_desc_t *,
bhv_
vnode_t *, bhv_desc_t *, int);
extern void xfs_flush_inode(struct xfs_inode *);
extern void xfs_flush_device(struct xfs_inode *);
extern void xfs_flush_inode(struct xfs_inode *);
extern void xfs_flush_device(struct xfs_inode *);
@@
-120,6
+115,6
@@
extern int xfs_blkdev_get(struct xfs_mount *, const char *,
extern void xfs_blkdev_put(struct block_device *);
extern void xfs_blkdev_issue_flush(struct xfs_buftarg *);
extern void xfs_blkdev_put(struct block_device *);
extern void xfs_blkdev_issue_flush(struct xfs_buftarg *);
-extern struct export_operations
linvfs_export_op
s;
+extern struct export_operations
xfs_export_operation
s;
#endif /* __XFS_SUPER_H__ */
#endif /* __XFS_SUPER_H__ */