Merge tag 'arc-v3.10-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / fs / cifs / xattr.c

diff --git a/fs/cifs/xattr.c b/fs/cifs/xattr.c
index 5142f2c60278e7432e4b9921eb869ca9e426ebf8..09afda4cc58e67aa0627bc3ba7c70167cd4ae73f 100644 (file)
--- a/fs/cifs/xattr.c
+++ b/fs/cifs/xattr.c
@@ -68,12 +68,12 @@ int cifs_removexattr(struct dentry *direntry, const char *ea_name)
                goto remove_ea_exit;
        }
        if (ea_name == NULL) {
-               cFYI(1, "Null xattr names not supported");
+               cifs_dbg(FYI, "Null xattr names not supported\n");
        } else if (strncmp(ea_name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)
                && (strncmp(ea_name, XATTR_OS2_PREFIX, XATTR_OS2_PREFIX_LEN))) {
-               cFYI(1,
-                    "illegal xattr request %s (only user namespace supported)",
-                    ea_name);
+               cifs_dbg(FYI,
+                        "illegal xattr request %s (only user namespace supported)\n",
+                        ea_name);
                /* BB what if no namespace prefix? */
                /* Should we just pass them to server, except for
                system and perhaps security prefixes? */
@@ -134,19 +134,19 @@ int cifs_setxattr(struct dentry *direntry, const char *ea_name,
                search server for EAs or streams to
                returns as xattrs */
        if (value_size > MAX_EA_VALUE_SIZE) {
-               cFYI(1, "size of EA value too large");
+               cifs_dbg(FYI, "size of EA value too large\n");
                rc = -EOPNOTSUPP;
                goto set_ea_exit;
        }
 
        if (ea_name == NULL) {
-               cFYI(1, "Null xattr names not supported");
+               cifs_dbg(FYI, "Null xattr names not supported\n");
        } else if (strncmp(ea_name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)
                   == 0) {
                if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_XATTR)
                        goto set_ea_exit;
                if (strncmp(ea_name, CIFS_XATTR_DOS_ATTRIB, 14) == 0)
-                       cFYI(1, "attempt to set cifs inode metadata");
+                       cifs_dbg(FYI, "attempt to set cifs inode metadata\n");
 
                ea_name += XATTR_USER_PREFIX_LEN; /* skip past user. prefix */
                rc = CIFSSMBSetEA(xid, pTcon, full_path, ea_name, ea_value,
@@ -167,8 +167,6 @@ int cifs_setxattr(struct dentry *direntry, const char *ea_name,
                struct cifs_ntsd *pacl;
                pacl = kmalloc(value_size, GFP_KERNEL);
                if (!pacl) {
-                       cFYI(1, "%s: Can't allocate memory for ACL",
-                                       __func__);
                        rc = -ENOMEM;
                } else {
                        memcpy(pacl, ea_value, value_size);
@@ -179,7 +177,7 @@ int cifs_setxattr(struct dentry *direntry, const char *ea_name,
                        kfree(pacl);
                }
 #else
-                       cFYI(1, "Set CIFS ACL not supported yet");
+               cifs_dbg(FYI, "Set CIFS ACL not supported yet\n");
 #endif /* CONFIG_CIFS_ACL */
        } else {
                int temp;
@@ -193,9 +191,9 @@ int cifs_setxattr(struct dentry *direntry, const char *ea_name,
                                        ACL_TYPE_ACCESS, cifs_sb->local_nls,
                                        cifs_sb->mnt_cifs_flags &
                                                CIFS_MOUNT_MAP_SPECIAL_CHR);
-                       cFYI(1, "set POSIX ACL rc %d", rc);
+                       cifs_dbg(FYI, "set POSIX ACL rc %d\n", rc);
 #else
-                       cFYI(1, "set POSIX ACL not supported");
+                       cifs_dbg(FYI, "set POSIX ACL not supported\n");
 #endif
                } else if (strncmp(ea_name, POSIX_ACL_XATTR_DEFAULT,
                                   strlen(POSIX_ACL_XATTR_DEFAULT)) == 0) {
@@ -206,13 +204,13 @@ int cifs_setxattr(struct dentry *direntry, const char *ea_name,
                                        ACL_TYPE_DEFAULT, cifs_sb->local_nls,
                                        cifs_sb->mnt_cifs_flags &
                                                CIFS_MOUNT_MAP_SPECIAL_CHR);
-                       cFYI(1, "set POSIX default ACL rc %d", rc);
+                       cifs_dbg(FYI, "set POSIX default ACL rc %d\n", rc);
 #else
-                       cFYI(1, "set default POSIX ACL not supported");
+                       cifs_dbg(FYI, "set default POSIX ACL not supported\n");
 #endif
                } else {
-                       cFYI(1, "illegal xattr request %s (only user namespace"
-                               " supported)", ea_name);
+                       cifs_dbg(FYI, "illegal xattr request %s (only user namespace supported)\n",
+                                ea_name);
                  /* BB what if no namespace prefix? */
                  /* Should we just pass them to server, except for
                  system and perhaps security prefixes? */
@@ -263,14 +261,14 @@ ssize_t cifs_getxattr(struct dentry *direntry, const char *ea_name,
        /* return dos attributes as pseudo xattr */
        /* return alt name if available as pseudo attr */
        if (ea_name == NULL) {
-               cFYI(1, "Null xattr names not supported");
+               cifs_dbg(FYI, "Null xattr names not supported\n");
        } else if (strncmp(ea_name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)
                   == 0) {
                if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_XATTR)
                        goto get_ea_exit;
 
                if (strncmp(ea_name, CIFS_XATTR_DOS_ATTRIB, 14) == 0) {
-                       cFYI(1, "attempt to query cifs inode metadata");
+                       cifs_dbg(FYI, "attempt to query cifs inode metadata\n");
                        /* revalidate/getattr then populate from inode */
                } /* BB add else when above is implemented */
                ea_name += XATTR_USER_PREFIX_LEN; /* skip past user. prefix */
@@ -295,7 +293,7 @@ ssize_t cifs_getxattr(struct dentry *direntry, const char *ea_name,
                                cifs_sb->mnt_cifs_flags &
                                        CIFS_MOUNT_MAP_SPECIAL_CHR);
 #else
-               cFYI(1, "Query POSIX ACL not supported yet");
+               cifs_dbg(FYI, "Query POSIX ACL not supported yet\n");
 #endif /* CONFIG_CIFS_POSIX */
        } else if (strncmp(ea_name, POSIX_ACL_XATTR_DEFAULT,
                          strlen(POSIX_ACL_XATTR_DEFAULT)) == 0) {
@@ -307,7 +305,7 @@ ssize_t cifs_getxattr(struct dentry *direntry, const char *ea_name,
                                cifs_sb->mnt_cifs_flags &
                                        CIFS_MOUNT_MAP_SPECIAL_CHR);
 #else
-               cFYI(1, "Query POSIX default ACL not supported yet");
+               cifs_dbg(FYI, "Query POSIX default ACL not supported yet\n");
 #endif /* CONFIG_CIFS_POSIX */
        } else if (strncmp(ea_name, CIFS_XATTR_CIFS_ACL,
                                strlen(CIFS_XATTR_CIFS_ACL)) == 0) {
@@ -319,8 +317,8 @@ ssize_t cifs_getxattr(struct dentry *direntry, const char *ea_name,
                                                full_path, &acllen);
                        if (IS_ERR(pacl)) {
                                rc = PTR_ERR(pacl);
-                               cERROR(1, "%s: error %zd getting sec desc",
-                                               __func__, rc);
+                               cifs_dbg(VFS, "%s: error %zd getting sec desc\n",
+                                        __func__, rc);
                        } else {
                                if (ea_value) {
                                        if (acllen > buf_size)
@@ -332,18 +330,18 @@ ssize_t cifs_getxattr(struct dentry *direntry, const char *ea_name,
                                kfree(pacl);
                        }
 #else
-               cFYI(1, "Query CIFS ACL not supported yet");
+                       cifs_dbg(FYI, "Query CIFS ACL not supported yet\n");
 #endif /* CONFIG_CIFS_ACL */
        } else if (strncmp(ea_name,
                  XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN) == 0) {
-               cFYI(1, "Trusted xattr namespace not supported yet");
+               cifs_dbg(FYI, "Trusted xattr namespace not supported yet\n");
        } else if (strncmp(ea_name,
                  XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN) == 0) {
-               cFYI(1, "Security xattr namespace not supported yet");
+               cifs_dbg(FYI, "Security xattr namespace not supported yet\n");
        } else
-               cFYI(1,
-                   "illegal xattr request %s (only user namespace supported)",
-                    ea_name);
+               cifs_dbg(FYI,
+                        "illegal xattr request %s (only user namespace supported)\n",
+                        ea_name);
 
        /* We could add an additional check for streams ie
            if proc/fs/cifs/streamstoxattr is set then