Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

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

diff --git a/fs/cifs/xattr.c b/fs/cifs/xattr.c
index 5c4cf2926849eb8b2acc30a0cbbb6a4065536506..f61e433d281c908c6b106a8f3c95ed8bf267ec9b 100644 (file)
--- a/fs/cifs/xattr.c
+++ b/fs/cifs/xattr.c
@@ -37,7 +37,7 @@
 #define XATTR_TRUSTED_PREFIX_LEN  8
 #define XATTR_SECURITY_PREFIX_LEN 9
 /* BB need to add server (Samba e.g) support for security and trusted prefix */
-  
+
 
 
 int cifs_removexattr(struct dentry *direntry, const char *ea_name)
@@ -184,7 +184,8 @@ int cifs_setxattr(struct dentry *direntry, const char *ea_name,
                        cFYI(1, ("set default POSIX ACL not supported"));
 #endif
                } else {
-                       cFYI(1, ("illegal xattr request %s (only user namespace supported)", ea_name));
+                       cFYI(1, ("illegal xattr request %s (only user namespace"
+                                " supported)", ea_name));
                  /* BB what if no namespace prefix? */
                  /* Should we just pass them to server, except for
                  system and perhaps security prefixes? */