git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[XFS] Fix merge failures
[pandora-kernel.git]
/
fs
/
xfs
/
xfs_inode.h
diff --git
a/fs/xfs/xfs_inode.h
b/fs/xfs/xfs_inode.h
index
f0e4d79
..
1f175fa
100644
(file)
--- a/
fs/xfs/xfs_inode.h
+++ b/
fs/xfs/xfs_inode.h
@@
-503,7
+503,7
@@
void xfs_ireclaim(xfs_inode_t *);
* xfs_inode.c prototypes.
*/
int xfs_ialloc(struct xfs_trans *, xfs_inode_t *, mode_t,
* xfs_inode.c prototypes.
*/
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 **);
uint xfs_ip2xflags(struct xfs_inode *);
int, struct xfs_buf **, boolean_t *, xfs_inode_t **);
uint xfs_ip2xflags(struct xfs_inode *);