From: Lachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Date: Mon, 29 Dec 2008 05:47:18 +0000 (+1100)
Subject: [XFS] Fix merge failures
X-Git-Tag: v2.6.29-rc1~552^2
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=0a8c5395f90f06d128247844b2515c8bf3f2826b;p=linux-2.6-omap-h63xx.git

[XFS] Fix merge failures

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	fs/xfs/linux-2.6/xfs_cred.h
	fs/xfs/linux-2.6/xfs_globals.h
	fs/xfs/linux-2.6/xfs_ioctl.c
	fs/xfs/xfs_vnodeops.h

Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
---

0a8c5395f90f06d128247844b2515c8bf3f2826b
diff --cc fs/xfs/linux-2.6/xfs_cred.h
index e279d00779f,8c022cd0ad6..55bddf3b609
--- a/fs/xfs/linux-2.6/xfs_cred.h
+++ b/fs/xfs/linux-2.6/xfs_cred.h
@@@ -23,8 -23,14 +23,6 @@@
  /*
   * Credentials
   */
- typedef struct cred {
-        /* EMPTY */
- } cred_t;
+ typedef const struct cred cred_t;
  
 -extern cred_t *sys_cred;
 -
 -/* this is a hack.. (assumes sys_cred is the only cred_t in the system) */
 -static inline int capable_cred(cred_t *cr, int cid)
 -{
 -	return (cr == sys_cred) ? 1 : capable(cid);
 -}
 -
  #endif  /* __XFS_CRED_H__ */
diff --cc fs/xfs/linux-2.6/xfs_ioctl.c
index 0264c8719ff,281cbd5a25c..67205f6198b
--- a/fs/xfs/linux-2.6/xfs_ioctl.c
+++ b/fs/xfs/linux-2.6/xfs_ioctl.c
@@@ -314,7 -322,7 +315,7 @@@ xfs_open_by_handle
  	mntget(parfilp->f_path.mnt);
  
  	/* Create file pointer. */
- 	filp = dentry_open(dentry, parfilp->f_path.mnt, hreq->oflags);
 -	filp = dentry_open(dentry, parfilp->f_path.mnt, hreq.oflags, cred);
++	filp = dentry_open(dentry, parfilp->f_path.mnt, hreq->oflags, cred);
  	if (IS_ERR(filp)) {
  		put_unused_fd(new_fd);
  		return -XFS_ERROR(-PTR_ERR(filp));
diff --cc fs/xfs/xfs_inode.h
index f0e4d79833e,6be310d41da..1f175fa34b2
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@@ -502,9 -490,19 +502,9 @@@ void		xfs_ireclaim(xfs_inode_t *)
  /*
   * 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,
+ 			   xfs_nlink_t, xfs_dev_t, cred_t *, 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 *);