Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'

1 files changed, 6 insertions, 0 deletions

diff --git a/fs/ioprio.c b/fs/ioprio.c
index ca77008146c0..7fa76ed53c10 100644
--- a/fs/ioprio.c
+++ b/fs/ioprio.c
@@ -24,15 +24,21 @@
 #include <linux/blkdev.h>
 #include <linux/capability.h>
 #include <linux/syscalls.h>
+#include <linux/security.h>
 
 static int set_task_ioprio(struct task_struct *task, int ioprio)
 {
+        int err;
         struct io_context *ioc;
 
         if (task->uid != current->euid &&
             task->uid != current->uid && !capable(CAP_SYS_NICE))
                 return -EPERM;
 
+        err = security_task_setioprio(task, ioprio);
+        if (err)
+                return err;
+
         task_lock(task);
 
         task->ioprio = ioprio;