Date: Fri, 29 Aug 2008 17:59:43 +1000
To: "xfs@oss.sgi.com" <xfs@oss.sgi.com>
Subject: Re: [REVIEW #2]  Update kernel code to compile in userspace (libxfs)
From: "Barry Naujok" <bnaujok@sgi.com>
Organization: SGI
Content-Type: text/plain; format=flowed; delsp=yes; charset=utf-8
MIME-Version: 1.0
References: <op.ugmy3u2o3jf8g2@pc-bnaujok.melbourne.sgi.com>
Content-Transfer-Encoding: 7bit
Message-ID: <op.ugm1ttzb3jf8g2@pc-bnaujok.melbourne.sgi.com>
In-Reply-To: <op.ugmy3u2o3jf8g2@pc-bnaujok.melbourne.sgi.com>
User-Agent: Opera Mail/9.51 (Win32)
Sender: xfs-bounce@oss.sgi.com
Errors-to: xfs-bounce@oss.sgi.com
Precedence: bulk

On Fri, 29 Aug 2008 17:00:56 +1000, Barry Naujok <bnaujok@sgi.com> wrote:

> Mostly header changes associated with #ifdef __KERNEL__ stuff.
>
> Some function prototypes had to be reordered to separate
> shared and kernel only functions.

fs/xfs/xfs_inode.h patch looked pretty horrid (and there was a missing
declaration), here's a better version:

Index: 2.6.x-xfs/fs/xfs/xfs_inode.h
===================================================================
--- 2.6.x-xfs.orig/fs/xfs/xfs_inode.h
+++ 2.6.x-xfs/fs/xfs/xfs_inode.h
@@ -131,6 +131,8 @@ typedef struct dm_attrs_s {
  	__uint16_t	da_pad;		/* DMIG extra padding */
  } dm_attrs_t;

+#endif	/* __KERNEL__ */
+
  /*
   * This is the xfs in-core inode structure.
   * Most of the on-disk inode is embedded in the i_d field.
@@ -191,6 +193,8 @@ typedef struct xfs_icdinode {
  	__uint32_t	di_gen;		/* generation number */
  } xfs_icdinode_t;

+#ifdef __KERNEL__
+
  typedef struct {
  	struct xfs_inode	*ip_mnext;	/* next inode in mount list */
  	struct xfs_inode	*ip_mprev;	/* ptr to prev inode */
@@ -490,19 +494,12 @@ int		xfs_finish_reclaim_all(struct xfs_m
  /*
   * xfs_inode.c prototypes.
   */
-int		xfs_itobp(struct xfs_mount *, struct xfs_trans *,
-			  xfs_inode_t *, struct xfs_dinode **, struct xfs_buf **,
-			  xfs_daddr_t, uint, uint);
  int		xfs_iread(struct xfs_mount *, struct xfs_trans *, xfs_ino_t,
  			  xfs_inode_t **, xfs_daddr_t, uint);
  int		xfs_iread_extents(struct xfs_trans *, xfs_inode_t *, int);
  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 **);
-void		xfs_dinode_from_disk(struct xfs_icdinode *,
-				     struct xfs_dinode_core *);
-void		xfs_dinode_to_disk(struct xfs_dinode_core *,
-				   struct xfs_icdinode *);

  uint		xfs_ip2xflags(struct xfs_inode *);
  uint		xfs_dic2xflags(struct xfs_dinode *);
@@ -514,15 +511,11 @@ int		xfs_itruncate_finish(struct xfs_tra
  int		xfs_iunlink(struct xfs_trans *, xfs_inode_t *);

  struct xfs_inode * xfs_inode_alloc(struct xfs_mount *, xfs_ino_t);
-void		xfs_idestroy_fork(xfs_inode_t *, int);
  void		xfs_idestroy(xfs_inode_t *);
-void		xfs_idata_realloc(xfs_inode_t *, int, int);
  void		xfs_iextract(xfs_inode_t *);
  void		xfs_iext_realloc(xfs_inode_t *, int, int);
-void		xfs_iroot_realloc(xfs_inode_t *, int, int);
  void		xfs_ipin(xfs_inode_t *);
  void		xfs_iunpin(xfs_inode_t *);
-int		xfs_iextents_copy(xfs_inode_t *, xfs_bmbt_rec_t *, int);
  int		xfs_iflush(xfs_inode_t *, uint);
  void		xfs_iflush_all(struct xfs_mount *);
  void		xfs_ichgtime(xfs_inode_t *, int);
@@ -532,6 +525,19 @@ void		xfs_lock_two_inodes(xfs_inode_t *,

  void		xfs_synchronize_atime(xfs_inode_t *);
  void		xfs_mark_inode_dirty_sync(xfs_inode_t *);
+#endif /* __KERNEL__ */
+
+int		xfs_itobp(struct xfs_mount *, struct xfs_trans *,
+			  xfs_inode_t *, struct xfs_dinode **, struct xfs_buf **,
+			  xfs_daddr_t, uint, uint);
+void		xfs_dinode_from_disk(struct xfs_icdinode *,
+				     struct xfs_dinode_core *);
+void		xfs_dinode_to_disk(struct xfs_dinode_core *,
+				   struct xfs_icdinode *);
+void		xfs_idestroy_fork(xfs_inode_t *, int);
+void		xfs_idata_realloc(xfs_inode_t *, int, int);
+void		xfs_iroot_realloc(xfs_inode_t *, int, int);
+int		xfs_iextents_copy(xfs_inode_t *, xfs_bmbt_rec_t *, int);

  xfs_bmbt_rec_host_t *xfs_iext_get_ext(xfs_ifork_t *, xfs_extnum_t);
  void		xfs_iext_insert(xfs_ifork_t *, xfs_extnum_t, xfs_extnum_t,
@@ -577,6 +583,8 @@ extern struct kmem_zone	*xfs_ifork_zone;
  extern struct kmem_zone	*xfs_inode_zone;
  extern struct kmem_zone	*xfs_ili_zone;

+#ifdef __KERNEL__
+
  /*
   * Manage the i_flush queue embedded in the inode.  This completion
   * queue synchronizes processes attempting to flush the in-core