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_dfrag.h
diff --git
a/fs/xfs/xfs_dfrag.h
b/fs/xfs/xfs_dfrag.h
index
da17820
..
4f55a63
100644
(file)
--- a/
fs/xfs/xfs_dfrag.h
+++ b/
fs/xfs/xfs_dfrag.h
@@
-46,7
+46,7
@@
typedef struct xfs_swapext
/*
* Syscall interface for xfs_swapext
*/
/*
* Syscall interface for xfs_swapext
*/
-int xfs_swapext(struct xfs_swapext
__user
*sx);
+int xfs_swapext(struct xfs_swapext *sx);
int xfs_swap_extents(struct xfs_inode *ip, struct xfs_inode *tip,
struct xfs_swapext *sxp);
int xfs_swap_extents(struct xfs_inode *ip, struct xfs_inode *tip,
struct xfs_swapext *sxp);