Merge branch 'linus' into core/percpu

[safe/jmp/linux-2.6] / block / cmd-filter.c

diff --git a/block/cmd-filter.c b/block/cmd-filter.c
index e669aed..504b275 100644 (file)
--- a/block/cmd-filter.c
+++ b/block/cmd-filter.c
@@ -27,7 +27,7 @@
 #include <linux/cdrom.h>
 
 int blk_verify_command(struct blk_cmd_filter *filter,
-                      unsigned char *cmd, int has_write_perm)
+                      unsigned char *cmd, fmode_t has_write_perm)
 {
        /* root can do any command. */
        if (capable(CAP_SYS_RAWIO))