Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d73cf13 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Lachlan McIlroy
Browse files

[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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent 2175dd95

fs/xfs/xfs_inode.h

+8 −8
Original line number Diff line number Diff line
@@ -481,12 +481,6 @@ static inline void xfs_ifunlock(xfs_inode_t *ip) 
	(((pip)->i_mount->m_flags & XFS_MOUNT_GRPID) || \

	 ((pip)->i_d.di_mode & S_ISGID))



/*

 * Flags for xfs_iget()

 */

#define XFS_IGET_CREATE		0x1

#define XFS_IGET_BULKSTAT	0x2



/*

 * xfs_iget.c prototypes.

 */
@@ -508,8 +502,6 @@ void xfs_ireclaim(xfs_inode_t *); 
/*

 * xfs_inode.c prototypes.

 */

int		xfs_iread(struct xfs_mount *, struct xfs_trans *,

			  struct xfs_inode *, xfs_daddr_t, uint);

int		xfs_ialloc(struct xfs_trans *, xfs_inode_t *, mode_t,

			   xfs_nlink_t, xfs_dev_t, struct cred *, xfs_prid_t,

			   int, struct xfs_buf **, boolean_t *, xfs_inode_t **);
@@ -582,12 +574,20 @@ do { \ 


#endif /* __KERNEL__ */



/*

 * Flags for xfs_iget()

 */

#define XFS_IGET_CREATE		0x1

#define XFS_IGET_BULKSTAT	0x2



int		xfs_inotobp(struct xfs_mount *, struct xfs_trans *,

			    xfs_ino_t, struct xfs_dinode **,

			    struct xfs_buf **, int *, uint);

int		xfs_itobp(struct xfs_mount *, struct xfs_trans *,

			  struct xfs_inode *, struct xfs_dinode **,

			  struct xfs_buf **, uint);

int		xfs_iread(struct xfs_mount *, struct xfs_trans *,

			  struct xfs_inode *, xfs_daddr_t, uint);

void		xfs_dinode_from_disk(struct xfs_icdinode *,

				     struct xfs_dinode *);

void		xfs_dinode_to_disk(struct xfs_dinode *,

fs/xfs/xfs_mount.h

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 
#ifndef __XFS_MOUNT_H__

#define	__XFS_MOUNT_H__



#include "xfs_sync.h"



typedef struct xfs_trans_reservations {

	uint	tr_write;	/* extent alloc trans */

	uint	tr_itruncate;	/* truncate trans */
@@ -53,6 +51,8 @@ typedef struct xfs_trans_reservations { 


#else /* __KERNEL__ */



#include "xfs_sync.h"



struct cred;

struct log;

struct xfs_mount_args;

fs/xfs/xfs_sb.h

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ struct xfs_mount; 
#define XFS_SB_VERSION2_LAZYSBCOUNTBIT	0x00000002	/* Superblk counters */

#define XFS_SB_VERSION2_RESERVED4BIT	0x00000004

#define XFS_SB_VERSION2_ATTR2BIT	0x00000008	/* Inline attr rework */

#define XFS_SB_VERSION2_PARENTBIT	0x00000010	/* parent pointers */



#define	XFS_SB_VERSION2_OKREALFBITS	\

	(XFS_SB_VERSION2_LAZYSBCOUNTBIT	| \

fs/xfs/xfs_inode.c

+1 −1

File changed.

Contains only whitespace changes.