Merge branch 'master' into next

This commit is contained in:
James Morris 2009-05-08 17:56:47 +10:00
commit d254117099
6181 changed files with 672645 additions and 214147 deletions

View file

@ -3145,7 +3145,7 @@ static int selinux_file_send_sigiotask(struct task_struct *tsk,
struct fown_struct *fown, int signum)
{
struct file *file;
u32 sid = current_sid();
u32 sid = task_sid(tsk);
u32 perm;
struct file_security_struct *fsec;