Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> +++ b/arch/powerpc/platforms/cell/spufs/inode.c
> ...
> +#include <linux/cred.h>
Yep.
> - filp = dentry_open(dentry, mnt, O_RDONLY);
> + filp = dentry_open(dentry, mnt, O_RDONLY, current_cred());
Yep.
> - filp = dentry_open(dentry, mnt, O_RDONLY);
> + filp = dentry_open(dentry, mnt, O_RDONLY, current_cred());
Yep.
> +#ifdef CONFIG_KEYS
> /*
> * Release a set of thread group credentials.
> */
> void put_tgcred(struct thread_group_cred *tgcred)
> {
> -#ifdef CONFIG_KEYS
> if (atomic_dec_and_test(&tgcred->usage))
> call_rcu(&tgcred->rcu, put_tgcred_rcu);
> -#endif
> }
> +#else
> +#define put_tgcred(t)
> +#endif
That'll do.
> int copy_creds(struct task_struct *p, unsigned long clone_flags)
> {
> +#ifdef CONFIG_KEYS
> struct thread_group_cred *tgcred;
> +#endif
> struct cred *new;
>
> mutex_init(&p->cred_exec_mutex);
>
> +#ifdef CONFIG_KEYS
> if (!p->cred->thread_keyring && clone_flags & CLONE_THREAD) {
> +#else
> + if (clone_flags & CLONE_THREAD) {
> +#endif
> p->real_cred = get_cred(p->cred);
> get_cred(p->cred);
> return 0;
That should be okay.
Seems I forgot to compile with CONFIG_KEYS=n.
David
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
