projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[cascardo/linux.git]
/
fs
/
afs
/
security.c
diff --git
a/fs/afs/security.c
b/fs/afs/security.c
index
f9f424d
..
3bcbece
100644
(file)
--- a/
fs/afs/security.c
+++ b/
fs/afs/security.c
@@
-13,6
+13,7
@@
#include <linux/slab.h>
#include <linux/fs.h>
#include <linux/ctype.h>
#include <linux/slab.h>
#include <linux/fs.h>
#include <linux/ctype.h>
+#include <linux/sched.h>
#include <keys/rxrpc-type.h>
#include "internal.h"
#include <keys/rxrpc-type.h>
#include "internal.h"
@@
-94,7
+95,7
@@
static struct afs_vnode *afs_get_auth_inode(struct afs_vnode *vnode,
auth_inode = afs_iget(vnode->vfs_inode.i_sb, key,
&vnode->status.parent, NULL, NULL);
if (IS_ERR(auth_inode))
auth_inode = afs_iget(vnode->vfs_inode.i_sb, key,
&vnode->status.parent, NULL, NULL);
if (IS_ERR(auth_inode))
- return ERR_
PTR(PTR_ERR(auth_inode)
);
+ return ERR_
CAST(auth_inode
);
}
auth_vnode = AFS_FS_I(auth_inode);
}
auth_vnode = AFS_FS_I(auth_inode);
@@
-109,7
+110,7
@@
void afs_clear_permits(struct afs_vnode *vnode)
{
struct afs_permits *permits;
{
struct afs_permits *permits;
- _enter("{%x
}"
, vnode->fid.vnode);
+ _enter("{%x
:%u}", vnode->fid.vid
, vnode->fid.vnode);
mutex_lock(&vnode->permits_lock);
permits = vnode->permits;
mutex_lock(&vnode->permits_lock);
permits = vnode->permits;
@@
-132,7
+133,8
@@
void afs_cache_permit(struct afs_vnode *vnode, struct key *key, long acl_order)
struct afs_vnode *auth_vnode;
int count, loop;
struct afs_vnode *auth_vnode;
int count, loop;
- _enter("{%x},%x,%lx", vnode->fid.vnode, key_serial(key), acl_order);
+ _enter("{%x:%u},%x,%lx",
+ vnode->fid.vid, vnode->fid.vnode, key_serial(key), acl_order);
auth_vnode = afs_get_auth_inode(vnode, key);
if (IS_ERR(auth_vnode)) {
auth_vnode = afs_get_auth_inode(vnode, key);
if (IS_ERR(auth_vnode)) {
@@
-220,7
+222,8
@@
static int afs_check_permit(struct afs_vnode *vnode, struct key *key,
bool valid;
int loop, ret;
bool valid;
int loop, ret;
- _enter("");
+ _enter("{%x:%u},%x",
+ vnode->fid.vid, vnode->fid.vnode, key_serial(key));
auth_vnode = afs_get_auth_inode(vnode, key);
if (IS_ERR(auth_vnode)) {
auth_vnode = afs_get_auth_inode(vnode, key);
if (IS_ERR(auth_vnode)) {
@@
-268,9
+271,9
@@
static int afs_check_permit(struct afs_vnode *vnode, struct key *key,
_leave(" = %d", ret);
return ret;
}
_leave(" = %d", ret);
return ret;
}
+ *_access = vnode->status.caller_access;
}
}
- *_access = vnode->status.caller_access;
iput(&auth_vnode->vfs_inode);
_leave(" = 0 [access %x]", *_access);
return 0;
iput(&auth_vnode->vfs_inode);
_leave(" = 0 [access %x]", *_access);
return 0;
@@
-284,11
+287,11
@@
static int afs_check_permit(struct afs_vnode *vnode, struct key *key,
int afs_permission(struct inode *inode, int mask, struct nameidata *nd)
{
struct afs_vnode *vnode = AFS_FS_I(inode);
int afs_permission(struct inode *inode, int mask, struct nameidata *nd)
{
struct afs_vnode *vnode = AFS_FS_I(inode);
- afs_access_t
access
;
+ afs_access_t
uninitialized_var(access)
;
struct key *key;
int ret;
struct key *key;
int ret;
- _enter("{{%x:%
x
},%lx},%x,",
+ _enter("{{%x:%
u
},%lx},%x,",
vnode->fid.vid, vnode->fid.vnode, vnode->flags, mask);
key = afs_request_key(vnode->volume->cell);
vnode->fid.vid, vnode->fid.vnode, vnode->flags, mask);
key = afs_request_key(vnode->volume->cell);