aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2008-12-09 04:47:32 -0500
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>2008-12-10 21:14:17 -0500
commit6d73cf133c5477f7038577bfeda603ce9946f8cb (patch)
tree68426855963fe343ae796fb490518e62a2d1b1be /fs
parent2175dd95741bda5f438e4efe388a8c1bb5abf1cc (diff)
[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>
Diffstat (limited to 'fs')
-rw-r--r--fs/xfs/xfs_inode.c2
-rw-r--r--fs/xfs/xfs_inode.h16
-rw-r--r--fs/xfs/xfs_mount.h4
-rw-r--r--fs/xfs/xfs_sb.h1
4 files changed, 12 insertions, 11 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index f6b4c0f5bfd3..3adb868df183 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -870,7 +870,7 @@ xfs_iread(
870 * around for a while. This helps to keep recently accessed 870 * around for a while. This helps to keep recently accessed
871 * meta-data in-core longer. 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 * Use xfs_trans_brelse() to release the buffer containing the 876 * Use xfs_trans_brelse() to release the buffer containing the
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index 64222e266df7..f0e4d79833e1 100644
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -482,12 +482,6 @@ static inline void xfs_ifunlock(xfs_inode_t *ip)
482 ((pip)->i_d.di_mode & S_ISGID)) 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 * xfs_iget.c prototypes. 485 * xfs_iget.c prototypes.
492 */ 486 */
493xfs_inode_t *xfs_inode_incore(struct xfs_mount *, xfs_ino_t, 487xfs_inode_t *xfs_inode_incore(struct xfs_mount *, xfs_ino_t,
@@ -508,8 +502,6 @@ void xfs_ireclaim(xfs_inode_t *);
508/* 502/*
509 * xfs_inode.c prototypes. 503 * xfs_inode.c prototypes.
510 */ 504 */
511int xfs_iread(struct xfs_mount *, struct xfs_trans *,
512 struct xfs_inode *, xfs_daddr_t, uint);
513int xfs_ialloc(struct xfs_trans *, xfs_inode_t *, mode_t, 505int xfs_ialloc(struct xfs_trans *, xfs_inode_t *, mode_t,
514 xfs_nlink_t, xfs_dev_t, struct cred *, xfs_prid_t, 506 xfs_nlink_t, xfs_dev_t, struct cred *, xfs_prid_t,
515 int, struct xfs_buf **, boolean_t *, xfs_inode_t **); 507 int, struct xfs_buf **, boolean_t *, xfs_inode_t **);
@@ -582,12 +574,20 @@ do { \
582 574
583#endif /* __KERNEL__ */ 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
585int xfs_inotobp(struct xfs_mount *, struct xfs_trans *, 583int xfs_inotobp(struct xfs_mount *, struct xfs_trans *,
586 xfs_ino_t, struct xfs_dinode **, 584 xfs_ino_t, struct xfs_dinode **,
587 struct xfs_buf **, int *, uint); 585 struct xfs_buf **, int *, uint);
588int xfs_itobp(struct xfs_mount *, struct xfs_trans *, 586int xfs_itobp(struct xfs_mount *, struct xfs_trans *,
589 struct xfs_inode *, struct xfs_dinode **, 587 struct xfs_inode *, struct xfs_dinode **,
590 struct xfs_buf **, uint); 588 struct xfs_buf **, uint);
589int xfs_iread(struct xfs_mount *, struct xfs_trans *,
590 struct xfs_inode *, xfs_daddr_t, uint);
591void xfs_dinode_from_disk(struct xfs_icdinode *, 591void xfs_dinode_from_disk(struct xfs_icdinode *,
592 struct xfs_dinode *); 592 struct xfs_dinode *);
593void xfs_dinode_to_disk(struct xfs_dinode *, 593void xfs_dinode_to_disk(struct xfs_dinode *,
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index ae5da88ace20..c1e028467327 100644
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -18,8 +18,6 @@
18#ifndef __XFS_MOUNT_H__ 18#ifndef __XFS_MOUNT_H__
19#define __XFS_MOUNT_H__ 19#define __XFS_MOUNT_H__
20 20
21#include "xfs_sync.h"
22
23typedef struct xfs_trans_reservations { 21typedef struct xfs_trans_reservations {
24 uint tr_write; /* extent alloc trans */ 22 uint tr_write; /* extent alloc trans */
25 uint tr_itruncate; /* truncate trans */ 23 uint tr_itruncate; /* truncate trans */
@@ -53,6 +51,8 @@ typedef struct xfs_trans_reservations {
53 51
54#else /* __KERNEL__ */ 52#else /* __KERNEL__ */
55 53
54#include "xfs_sync.h"
55
56struct cred; 56struct cred;
57struct log; 57struct log;
58struct xfs_mount_args; 58struct xfs_mount_args;
diff --git a/fs/xfs/xfs_sb.h b/fs/xfs/xfs_sb.h
index e123c1499b4c..1ed71916e4c9 100644
--- a/fs/xfs/xfs_sb.h
+++ b/fs/xfs/xfs_sb.h
@@ -79,6 +79,7 @@ struct xfs_mount;
79#define XFS_SB_VERSION2_LAZYSBCOUNTBIT 0x00000002 /* Superblk counters */ 79#define XFS_SB_VERSION2_LAZYSBCOUNTBIT 0x00000002 /* Superblk counters */
80#define XFS_SB_VERSION2_RESERVED4BIT 0x00000004 80#define XFS_SB_VERSION2_RESERVED4BIT 0x00000004
81#define XFS_SB_VERSION2_ATTR2BIT 0x00000008 /* Inline attr rework */ 81#define XFS_SB_VERSION2_ATTR2BIT 0x00000008 /* Inline attr rework */
82#define XFS_SB_VERSION2_PARENTBIT 0x00000010 /* parent pointers */
82 83
83#define XFS_SB_VERSION2_OKREALFBITS \ 84#define XFS_SB_VERSION2_OKREALFBITS \
84 (XFS_SB_VERSION2_LAZYSBCOUNTBIT | \ 85 (XFS_SB_VERSION2_LAZYSBCOUNTBIT | \