Merge branch 'overlayfs.v25' of git://git.kernel.org/pub/scm/linux/kernel/git/mszered...

[sfrench/cifs-2.6.git] / security / capability.c

diff --git a/security/capability.c b/security/capability.c
index a74fde6a7468cda37e0eacee7fb7608aabfdce52..d68c57a62bcf72694b7705292ac3a61592dc67af 100644 (file)
--- a/security/capability.c
+++ b/security/capability.c
@@ -343,9 +343,9 @@ static int cap_file_fcntl(struct file *file, unsigned int cmd,
        return 0;
 }
 
-static int cap_file_set_fowner(struct file *file)
+static void cap_file_set_fowner(struct file *file)
 {
-       return 0;
+       return;
 }
 
 static int cap_file_send_sigiotask(struct task_struct *tsk,