Commit 6d73cf133c5477f7038577bfeda603ce9946f8cb
Committed by
Lachlan McIlroy
Lachlan McIlroy
1 parent
2175dd9574
Exists in
master
and in
4 other branches
[XFS] resync headers with libxfs
- xfs_sb.h add the XFS_SB_VERSION2_PARENTBIT features2 that has been around in userspace for some time - xfs_inode.h: move a few things out of __KERNEL__ that are needed by userspace - xfs_mount.h: only include xfs_sync.h under __KERNEL__ - xfs_inode.c: minor whitespace fixup. I accidentaly changes this when importing this file for use by userspace. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Showing 4 changed files with 12 additions and 11 deletions Side-by-side Diff
fs/xfs/xfs_inode.c
| ... | ... | @@ -870,7 +870,7 @@ |
| 870 | 870 | * around for a while. This helps to keep recently accessed |
| 871 | 871 | * meta-data in-core longer. |
| 872 | 872 | */ |
| 873 | - XFS_BUF_SET_REF(bp, XFS_INO_REF); | |
| 873 | + XFS_BUF_SET_REF(bp, XFS_INO_REF); | |
| 874 | 874 | |
| 875 | 875 | /* |
| 876 | 876 | * Use xfs_trans_brelse() to release the buffer containing the |
fs/xfs/xfs_inode.h
| ... | ... | @@ -482,12 +482,6 @@ |
| 482 | 482 | ((pip)->i_d.di_mode & S_ISGID)) |
| 483 | 483 | |
| 484 | 484 | /* |
| 485 | - * Flags for xfs_iget() | |
| 486 | - */ | |
| 487 | -#define XFS_IGET_CREATE 0x1 | |
| 488 | -#define XFS_IGET_BULKSTAT 0x2 | |
| 489 | - | |
| 490 | -/* | |
| 491 | 485 | * xfs_iget.c prototypes. |
| 492 | 486 | */ |
| 493 | 487 | xfs_inode_t *xfs_inode_incore(struct xfs_mount *, xfs_ino_t, |
| ... | ... | @@ -508,8 +502,6 @@ |
| 508 | 502 | /* |
| 509 | 503 | * xfs_inode.c prototypes. |
| 510 | 504 | */ |
| 511 | -int xfs_iread(struct xfs_mount *, struct xfs_trans *, | |
| 512 | - struct xfs_inode *, xfs_daddr_t, uint); | |
| 513 | 505 | int xfs_ialloc(struct xfs_trans *, xfs_inode_t *, mode_t, |
| 514 | 506 | xfs_nlink_t, xfs_dev_t, struct cred *, xfs_prid_t, |
| 515 | 507 | int, struct xfs_buf **, boolean_t *, xfs_inode_t **); |
| 516 | 508 | |
| ... | ... | @@ -582,12 +574,20 @@ |
| 582 | 574 | |
| 583 | 575 | #endif /* __KERNEL__ */ |
| 584 | 576 | |
| 577 | +/* | |
| 578 | + * Flags for xfs_iget() | |
| 579 | + */ | |
| 580 | +#define XFS_IGET_CREATE 0x1 | |
| 581 | +#define XFS_IGET_BULKSTAT 0x2 | |
| 582 | + | |
| 585 | 583 | int xfs_inotobp(struct xfs_mount *, struct xfs_trans *, |
| 586 | 584 | xfs_ino_t, struct xfs_dinode **, |
| 587 | 585 | struct xfs_buf **, int *, uint); |
| 588 | 586 | int xfs_itobp(struct xfs_mount *, struct xfs_trans *, |
| 589 | 587 | struct xfs_inode *, struct xfs_dinode **, |
| 590 | 588 | struct xfs_buf **, uint); |
| 589 | +int xfs_iread(struct xfs_mount *, struct xfs_trans *, | |
| 590 | + struct xfs_inode *, xfs_daddr_t, uint); | |
| 591 | 591 | void xfs_dinode_from_disk(struct xfs_icdinode *, |
| 592 | 592 | struct xfs_dinode *); |
| 593 | 593 | void xfs_dinode_to_disk(struct xfs_dinode *, |
fs/xfs/xfs_mount.h
| ... | ... | @@ -18,8 +18,6 @@ |
| 18 | 18 | #ifndef __XFS_MOUNT_H__ |
| 19 | 19 | #define __XFS_MOUNT_H__ |
| 20 | 20 | |
| 21 | -#include "xfs_sync.h" | |
| 22 | - | |
| 23 | 21 | typedef struct xfs_trans_reservations { |
| 24 | 22 | uint tr_write; /* extent alloc trans */ |
| 25 | 23 | uint tr_itruncate; /* truncate trans */ |
| ... | ... | @@ -52,6 +50,8 @@ |
| 52 | 50 | ((xfs_agblock_t)(XFS_BB_TO_FSBT(mp, d) % (mp)->m_sb.sb_agblocks)) |
| 53 | 51 | |
| 54 | 52 | #else /* __KERNEL__ */ |
| 53 | + | |
| 54 | +#include "xfs_sync.h" | |
| 55 | 55 | |
| 56 | 56 | struct cred; |
| 57 | 57 | struct log; |
fs/xfs/xfs_sb.h
| ... | ... | @@ -79,6 +79,7 @@ |
| 79 | 79 | #define XFS_SB_VERSION2_LAZYSBCOUNTBIT 0x00000002 /* Superblk counters */ |
| 80 | 80 | #define XFS_SB_VERSION2_RESERVED4BIT 0x00000004 |
| 81 | 81 | #define XFS_SB_VERSION2_ATTR2BIT 0x00000008 /* Inline attr rework */ |
| 82 | +#define XFS_SB_VERSION2_PARENTBIT 0x00000010 /* parent pointers */ | |
| 82 | 83 | |
| 83 | 84 | #define XFS_SB_VERSION2_OKREALFBITS \ |
| 84 | 85 | (XFS_SB_VERSION2_LAZYSBCOUNTBIT | \ |