Merge branch 'parisc-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/delle...
[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / cifs / inode.c
index 20887bf63121286e3d52f582db922ec64f4a71e5..fc3025199cb336f6c07c8172d19e501601a3f1f7 100644 (file)
@@ -91,30 +91,32 @@ cifs_revalidate_cache(struct inode *inode, struct cifs_fattr *fattr)
 {
        struct cifsInodeInfo *cifs_i = CIFS_I(inode);
 
-       cFYI(1, "%s: revalidating inode %llu", __func__, cifs_i->uniqueid);
+       cifs_dbg(FYI, "%s: revalidating inode %llu\n",
+                __func__, cifs_i->uniqueid);
 
        if (inode->i_state & I_NEW) {
-               cFYI(1, "%s: inode %llu is new", __func__, cifs_i->uniqueid);
+               cifs_dbg(FYI, "%s: inode %llu is new\n",
+                        __func__, cifs_i->uniqueid);
                return;
        }
 
        /* don't bother with revalidation if we have an oplock */
        if (cifs_i->clientCanCacheRead) {
-               cFYI(1, "%s: inode %llu is oplocked", __func__,
-                        cifs_i->uniqueid);
+               cifs_dbg(FYI, "%s: inode %llu is oplocked\n",
+                        __func__, cifs_i->uniqueid);
                return;
        }
 
         /* revalidate if mtime or size have changed */
        if (timespec_equal(&inode->i_mtime, &fattr->cf_mtime) &&
            cifs_i->server_eof == fattr->cf_eof) {
-               cFYI(1, "%s: inode %llu is unchanged", __func__,
-                        cifs_i->uniqueid);
+               cifs_dbg(FYI, "%s: inode %llu is unchanged\n",
+                        __func__, cifs_i->uniqueid);
                return;
        }
 
-       cFYI(1, "%s: invalidating inode %llu mapping", __func__,
-                cifs_i->uniqueid);
+       cifs_dbg(FYI, "%s: invalidating inode %llu mapping\n",
+                __func__, cifs_i->uniqueid);
        cifs_i->invalid_mapping = true;
 }
 
@@ -240,7 +242,7 @@ cifs_unix_basic_to_fattr(struct cifs_fattr *fattr, FILE_UNIX_BASIC_INFO *info,
                /* safest to call it a file if we do not know */
                fattr->cf_mode |= S_IFREG;
                fattr->cf_dtype = DT_REG;
-               cFYI(1, "unknown type %d", le32_to_cpu(info->Type));
+               cifs_dbg(FYI, "unknown type %d\n", le32_to_cpu(info->Type));
                break;
        }
 
@@ -279,7 +281,7 @@ cifs_create_dfs_fattr(struct cifs_fattr *fattr, struct super_block *sb)
 {
        struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
 
-       cFYI(1, "creating fake fattr for DFS referral");
+       cifs_dbg(FYI, "creating fake fattr for DFS referral\n");
 
        memset(fattr, 0, sizeof(*fattr));
        fattr->cf_mode = S_IFDIR | S_IXUGO | S_IRWXU;
@@ -329,7 +331,7 @@ int cifs_get_inode_info_unix(struct inode **pinode,
        struct tcon_link *tlink;
        struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
 
-       cFYI(1, "Getting info on %s", full_path);
+       cifs_dbg(FYI, "Getting info on %s\n", full_path);
 
        tlink = cifs_sb_tlink(cifs_sb);
        if (IS_ERR(tlink))
@@ -355,7 +357,7 @@ int cifs_get_inode_info_unix(struct inode **pinode,
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS) {
                int tmprc = CIFSCheckMFSymlink(&fattr, full_path, cifs_sb, xid);
                if (tmprc)
-                       cFYI(1, "CIFSCheckMFSymlink: %d", tmprc);
+                       cifs_dbg(FYI, "CIFSCheckMFSymlink: %d\n", tmprc);
        }
 
        if (*pinode == NULL) {
@@ -422,7 +424,7 @@ cifs_sfu_type(struct cifs_fattr *fattr, const unsigned char *path,
                                 &buf_type);
                if ((rc == 0) && (bytes_read >= 8)) {
                        if (memcmp("IntxBLK", pbuf, 8) == 0) {
-                               cFYI(1, "Block device");
+                               cifs_dbg(FYI, "Block device\n");
                                fattr->cf_mode |= S_IFBLK;
                                fattr->cf_dtype = DT_BLK;
                                if (bytes_read == 24) {
@@ -434,7 +436,7 @@ cifs_sfu_type(struct cifs_fattr *fattr, const unsigned char *path,
                                        fattr->cf_rdev = MKDEV(mjr, mnr);
                                }
                        } else if (memcmp("IntxCHR", pbuf, 8) == 0) {
-                               cFYI(1, "Char device");
+                               cifs_dbg(FYI, "Char device\n");
                                fattr->cf_mode |= S_IFCHR;
                                fattr->cf_dtype = DT_CHR;
                                if (bytes_read == 24) {
@@ -446,7 +448,7 @@ cifs_sfu_type(struct cifs_fattr *fattr, const unsigned char *path,
                                        fattr->cf_rdev = MKDEV(mjr, mnr);
                                }
                        } else if (memcmp("IntxLNK", pbuf, 7) == 0) {
-                               cFYI(1, "Symlink");
+                               cifs_dbg(FYI, "Symlink\n");
                                fattr->cf_mode |= S_IFLNK;
                                fattr->cf_dtype = DT_LNK;
                        } else {
@@ -497,10 +499,10 @@ static int cifs_sfu_mode(struct cifs_fattr *fattr, const unsigned char *path,
        else if (rc > 3) {
                mode = le32_to_cpu(*((__le32 *)ea_value));
                fattr->cf_mode &= ~SFBITS_MASK;
-               cFYI(1, "special bits 0%o org mode 0%o", mode,
-                        fattr->cf_mode);
+               cifs_dbg(FYI, "special bits 0%o org mode 0%o\n",
+                        mode, fattr->cf_mode);
                fattr->cf_mode = (mode & SFBITS_MASK) | fattr->cf_mode;
-               cFYI(1, "special mode bits 0%o", mode);
+               cifs_dbg(FYI, "special mode bits 0%o\n", mode);
        }
 
        return 0;
@@ -635,11 +637,11 @@ cifs_get_inode_info(struct inode **inode, const char *full_path,
        tcon = tlink_tcon(tlink);
        server = tcon->ses->server;
 
-       cFYI(1, "Getting info on %s", full_path);
+       cifs_dbg(FYI, "Getting info on %s\n", full_path);
 
        if ((data == NULL) && (*inode != NULL)) {
                if (CIFS_I(*inode)->clientCanCacheRead) {
-                       cFYI(1, "No need to revalidate cached inode sizes");
+                       cifs_dbg(FYI, "No need to revalidate cached inode sizes\n");
                        goto cgii_exit;
                }
        }
@@ -714,7 +716,8 @@ cifs_get_inode_info(struct inode **inode, const char *full_path,
                                                tcon, cifs_sb, full_path,
                                                &fattr.cf_uniqueid, data);
                                if (tmprc) {
-                                       cFYI(1, "GetSrvInodeNum rc %d", tmprc);
+                                       cifs_dbg(FYI, "GetSrvInodeNum rc %d\n",
+                                                tmprc);
                                        fattr.cf_uniqueid = iunique(sb, ROOT_I);
                                        cifs_autodisable_serverino(cifs_sb);
                                }
@@ -729,7 +732,7 @@ cifs_get_inode_info(struct inode **inode, const char *full_path,
            cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) {
                tmprc = cifs_sfu_type(&fattr, full_path, cifs_sb, xid);
                if (tmprc)
-                       cFYI(1, "cifs_sfu_type failed: %d", tmprc);
+                       cifs_dbg(FYI, "cifs_sfu_type failed: %d\n", tmprc);
        }
 
 #ifdef CONFIG_CIFS_ACL
@@ -737,8 +740,8 @@ cifs_get_inode_info(struct inode **inode, const char *full_path,
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) {
                rc = cifs_acl_to_fattr(cifs_sb, &fattr, *inode, full_path, fid);
                if (rc) {
-                       cFYI(1, "%s: Getting ACL failed with error: %d",
-                               __func__, rc);
+                       cifs_dbg(FYI, "%s: Getting ACL failed with error: %d\n",
+                                __func__, rc);
                        goto cgii_exit;
                }
        }
@@ -752,7 +755,7 @@ cifs_get_inode_info(struct inode **inode, const char *full_path,
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS) {
                tmprc = CIFSCheckMFSymlink(&fattr, full_path, cifs_sb, xid);
                if (tmprc)
-                       cFYI(1, "CIFSCheckMFSymlink: %d", tmprc);
+                       cifs_dbg(FYI, "CIFSCheckMFSymlink: %d\n", tmprc);
        }
 
        if (!*inode) {
@@ -836,7 +839,7 @@ cifs_iget(struct super_block *sb, struct cifs_fattr *fattr)
        struct inode *inode;
 
 retry_iget5_locked:
-       cFYI(1, "looking for uniqueid=%llu", fattr->cf_uniqueid);
+       cifs_dbg(FYI, "looking for uniqueid=%llu\n", fattr->cf_uniqueid);
 
        /* hash down to 32-bits on 32-bit arch */
        hash = cifs_uniqueid_to_ino_t(fattr->cf_uniqueid);
@@ -899,7 +902,7 @@ struct inode *cifs_root_iget(struct super_block *sb)
 #endif
 
        if (rc && tcon->ipc) {
-               cFYI(1, "ipc connection - fake read inode");
+               cifs_dbg(FYI, "ipc connection - fake read inode\n");
                spin_lock(&inode->i_lock);
                inode->i_mode |= S_IFDIR;
                set_nlink(inode, 2);
@@ -958,7 +961,7 @@ cifs_set_file_info(struct inode *inode, struct iattr *attrs, unsigned int xid,
         * server times.
         */
        if (set_time && (attrs->ia_valid & ATTR_CTIME)) {
-               cFYI(1, "CIFS - CTIME changed");
+               cifs_dbg(FYI, "CIFS - CTIME changed\n");
                info_buf.ChangeTime =
                    cpu_to_le64(cifs_UnixTimeToNT(attrs->ia_ctime));
        } else
@@ -1127,7 +1130,7 @@ int cifs_unlink(struct inode *dir, struct dentry *dentry)
        struct iattr *attrs = NULL;
        __u32 dosattr = 0, origattr = 0;
 
-       cFYI(1, "cifs_unlink, dir=0x%p, dentry=0x%p", dir, dentry);
+       cifs_dbg(FYI, "cifs_unlink, dir=0x%p, dentry=0x%p\n", dir, dentry);
 
        tlink = cifs_sb_tlink(cifs_sb);
        if (IS_ERR(tlink))
@@ -1150,7 +1153,7 @@ int cifs_unlink(struct inode *dir, struct dentry *dentry)
                rc = CIFSPOSIXDelFile(xid, tcon, full_path,
                        SMB_POSIX_UNLINK_FILE_TARGET, cifs_sb->local_nls,
                        cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
-               cFYI(1, "posix del rc %d", rc);
+               cifs_dbg(FYI, "posix del rc %d\n", rc);
                if ((rc == 0) || (rc == -ENOENT))
                        goto psx_del_no_retry;
        }
@@ -1320,7 +1323,7 @@ cifs_posix_mkdir(struct inode *inode, struct dentry *dentry, umode_t mode,
        if (rc == -EOPNOTSUPP)
                goto posix_mkdir_out;
        else if (rc) {
-               cFYI(1, "posix mkdir returned 0x%x", rc);
+               cifs_dbg(FYI, "posix mkdir returned 0x%x\n", rc);
                d_drop(dentry);
                goto posix_mkdir_out;
        }
@@ -1342,11 +1345,12 @@ cifs_posix_mkdir(struct inode *inode, struct dentry *dentry, umode_t mode,
        d_instantiate(dentry, newinode);
 
 #ifdef CONFIG_CIFS_DEBUG2
-       cFYI(1, "instantiated dentry %p %s to inode %p", dentry,
-            dentry->d_name.name, newinode);
+       cifs_dbg(FYI, "instantiated dentry %p %s to inode %p\n",
+                dentry, dentry->d_name.name, newinode);
 
        if (newinode->i_nlink != 2)
-               cFYI(1, "unexpected number of links %d", newinode->i_nlink);
+               cifs_dbg(FYI, "unexpected number of links %d\n",
+                        newinode->i_nlink);
 #endif
 
 posix_mkdir_out:
@@ -1368,7 +1372,8 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, umode_t mode)
        struct TCP_Server_Info *server;
        char *full_path;
 
-       cFYI(1, "In cifs_mkdir, mode = 0x%hx inode = 0x%p", mode, inode);
+       cifs_dbg(FYI, "In cifs_mkdir, mode = 0x%hx inode = 0x%p\n",
+                mode, inode);
 
        cifs_sb = CIFS_SB(inode->i_sb);
        tlink = cifs_sb_tlink(cifs_sb);
@@ -1402,7 +1407,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, umode_t mode)
        /* BB add setting the equivalent of mode via CreateX w/ACLs */
        rc = server->ops->mkdir(xid, tcon, full_path, cifs_sb);
        if (rc) {
-               cFYI(1, "cifs_mkdir returned 0x%x", rc);
+               cifs_dbg(FYI, "cifs_mkdir returned 0x%x\n", rc);
                d_drop(direntry);
                goto mkdir_out;
        }
@@ -1432,7 +1437,7 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry)
        char *full_path = NULL;
        struct cifsInodeInfo *cifsInode;
 
-       cFYI(1, "cifs_rmdir, inode = 0x%p", inode);
+       cifs_dbg(FYI, "cifs_rmdir, inode = 0x%p\n", inode);
 
        xid = get_xid();
 
@@ -1681,8 +1686,8 @@ cifs_invalidate_mapping(struct inode *inode)
        if (inode->i_mapping && inode->i_mapping->nrpages != 0) {
                rc = invalidate_inode_pages2(inode->i_mapping);
                if (rc) {
-                       cERROR(1, "%s: could not invalidate inode %p", __func__,
-                              inode);
+                       cifs_dbg(VFS, "%s: could not invalidate inode %p\n",
+                                __func__, inode);
                        cifs_i->invalid_mapping = true;
                }
        }
@@ -1732,8 +1737,8 @@ int cifs_revalidate_dentry_attr(struct dentry *dentry)
                goto out;
        }
 
-       cFYI(1, "Update attributes: %s inode 0x%p count %d dentry: 0x%p d_time "
-                "%ld jiffies %ld", full_path, inode, inode->i_count.counter,
+       cifs_dbg(FYI, "Update attributes: %s inode 0x%p count %d dentry: 0x%p d_time %ld jiffies %ld\n",
+                full_path, inode, inode->i_count.counter,
                 dentry, dentry->d_time, jiffies);
 
        if (cifs_sb_master_tcon(CIFS_SB(sb))->unix_ext)
@@ -1883,7 +1888,7 @@ cifs_set_file_size(struct inode *inode, struct iattr *attrs,
                else
                        rc = -ENOSYS;
                cifsFileInfo_put(open_file);
-               cFYI(1, "SetFSize for attrs rc = %d", rc);
+               cifs_dbg(FYI, "SetFSize for attrs rc = %d\n", rc);
                if ((rc == -EINVAL) || (rc == -EOPNOTSUPP)) {
                        unsigned int bytes_written;
 
@@ -1894,7 +1899,7 @@ cifs_set_file_size(struct inode *inode, struct iattr *attrs,
                        io_parms.length = attrs->ia_size;
                        rc = CIFSSMBWrite(xid, &io_parms, &bytes_written,
                                          NULL, NULL, 1);
-                       cFYI(1, "Wrt seteof rc %d", rc);
+                       cifs_dbg(FYI, "Wrt seteof rc %d\n", rc);
                }
        } else
                rc = -EINVAL;
@@ -1920,7 +1925,7 @@ cifs_set_file_size(struct inode *inode, struct iattr *attrs,
                                                attrs->ia_size, cifs_sb, false);
        else
                rc = -ENOSYS;
-       cFYI(1, "SetEOF by path (setattrs) rc = %d", rc);
+       cifs_dbg(FYI, "SetEOF by path (setattrs) rc = %d\n", rc);
        if ((rc == -EINVAL) || (rc == -EOPNOTSUPP)) {
                __u16 netfid;
                int oplock = 0;
@@ -1940,7 +1945,7 @@ cifs_set_file_size(struct inode *inode, struct iattr *attrs,
                        io_parms.length = attrs->ia_size;
                        rc = CIFSSMBWrite(xid, &io_parms, &bytes_written, NULL,
                                          NULL,  1);
-                       cFYI(1, "wrt seteof rc %d", rc);
+                       cifs_dbg(FYI, "wrt seteof rc %d\n", rc);
                        CIFSSMBClose(xid, tcon, netfid);
                }
        }
@@ -1971,7 +1976,7 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs)
        struct cifs_unix_set_info_args *args = NULL;
        struct cifsFileInfo *open_file;
 
-       cFYI(1, "setattr_unix on file %s attrs->ia_valid=0x%x",
+       cifs_dbg(FYI, "setattr_unix on file %s attrs->ia_valid=0x%x\n",
                 direntry->d_name.name, attrs->ia_valid);
 
        xid = get_xid();
@@ -2114,7 +2119,7 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs)
 
        xid = get_xid();
 
-       cFYI(1, "setattr on file %s attrs->iavalid 0x%x",
+       cifs_dbg(FYI, "setattr on file %s attrs->iavalid 0x%x\n",
                 direntry->d_name.name, attrs->ia_valid);
 
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM)
@@ -2166,8 +2171,8 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs)
                        rc = id_mode_to_cifs_acl(inode, full_path, NO_CHANGE_64,
                                                        uid, gid);
                        if (rc) {
-                               cFYI(1, "%s: Setting id failed with error: %d",
-                                       __func__, rc);
+                               cifs_dbg(FYI, "%s: Setting id failed with error: %d\n",
+                                        __func__, rc);
                                goto cifs_setattr_exit;
                        }
                }
@@ -2188,8 +2193,8 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs)
                        rc = id_mode_to_cifs_acl(inode, full_path, mode,
                                                INVALID_UID, INVALID_GID);
                        if (rc) {
-                               cFYI(1, "%s: Setting ACL failed with error: %d",
-                                       __func__, rc);
+                               cifs_dbg(FYI, "%s: Setting ACL failed with error: %d\n",
+                                        __func__, rc);
                                goto cifs_setattr_exit;
                        }
                } else
@@ -2277,7 +2282,7 @@ cifs_setattr(struct dentry *direntry, struct iattr *attrs)
 #if 0
 void cifs_delete_inode(struct inode *inode)
 {
-       cFYI(1, "In cifs_delete_inode, inode = 0x%p", inode);
+       cifs_dbg(FYI, "In cifs_delete_inode, inode = 0x%p\n", inode);
        /* may have to add back in if and when safe distributed caching of
           directories added e.g. via FindNotify */
 }