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
/
linux-2.6
/
xfs_cred.h
diff --git
a/fs/xfs/linux-2.6/xfs_cred.h
b/fs/xfs/linux-2.6/xfs_cred.h
index
8c022cd
..
55bddf3
100644
(file)
--- a/
fs/xfs/linux-2.6/xfs_cred.h
+++ b/
fs/xfs/linux-2.6/xfs_cred.h
@@
-25,12
+25,4
@@
*/
typedef const struct cred 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__ */
#endif /* __XFS_CRED_H__ */