Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6] / fs / cifs / cifs_debug.c

diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index 7c0015a96959337d66097bee53a82d05908ce21b..96abeb7389784d4e3f5fa6eb4ee72ea8d66b947a 100644 (file)
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -860,8 +860,6 @@ security_flags_write(struct file *file, const char __user *buffer,
        char flags_string[12];
        char c;
 
-       cERROR(1,("size %ld",count)); /* BB removeme BB */
-
        if((count < 1) || (count > 11))
                return -EINVAL;
 
@@ -883,15 +881,15 @@ security_flags_write(struct file *file, const char __user *buffer,
 
        flags = simple_strtoul(flags_string, NULL, 0);
 
-       cERROR(1,("sec flags 0x%x", flags));  /* BB FIXME make cFYI */
+       cFYI(1,("sec flags 0x%x", flags));
 
        if(flags <= 0)  {
                cERROR(1,("invalid security flags %s",flags_string));
                return -EINVAL;
        }
 
-       if((flags & CIFSSEC_MASK) != CIFSSEC_MASK) {
-               cERROR(1,("attempt to set unsupported security flags 0x%d",
+       if(flags & ~CIFSSEC_MASK) {
+               cERROR(1,("attempt to set unsupported security flags 0x%x",
                        flags & ~CIFSSEC_MASK));
                return -EINVAL;
        }