Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

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

diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index 7c0015a96959337d66097bee53a82d05908ce21b..6017c465440eaef7299e60632b0f03b71dcbffe4 100644 (file)
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -143,8 +143,8 @@ cifs_debug_data_read(char *buf, char **beginBuffer, off_t offset,
                ses = list_entry(tmp, struct cifsSesInfo, cifsSessionList);
                if((ses->serverDomain == NULL) || (ses->serverOS == NULL) ||
                   (ses->serverNOS == NULL)) {
-                       buf += sprintf("\nentry for %s not fully displayed\n\t",
-                                       ses->serverName);
+                       buf += sprintf(buf, "\nentry for %s not fully "
+                                       "displayed\n\t", ses->serverName);
                        
                } else {
                        length =
@@ -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;
        }