Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fs/coda: use __func__

Replace all function names by __func__ in pr_foo()

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Jan Harkes <jaharkes@cs.cmu.edu>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Fabian Frederick and committed by
Linus Torvalds
6d6bd94f f38cfb25

+34 -33
+2 -2
fs/coda/cnode.c
··· 101 101 102 102 inode = coda_iget(sb, fid, &attr); 103 103 if (IS_ERR(inode)) 104 - pr_warn("coda_cnode_make: coda_iget failed\n"); 104 + pr_warn("%s: coda_iget failed\n", __func__); 105 105 return inode; 106 106 } 107 107 ··· 137 137 unsigned long hash = coda_f2i(fid); 138 138 139 139 if ( !sb ) { 140 - pr_warn("coda_fid_to_inode: no sb!\n"); 140 + pr_warn("%s: no sb!\n", __func__); 141 141 return NULL; 142 142 } 143 143
+6 -6
fs/coda/dir.c
··· 453 453 ret = kernel_read(host_file, ctx->pos - 2, (char *)vdir, 454 454 sizeof(*vdir)); 455 455 if (ret < 0) { 456 - pr_err("coda readdir: read dir %s failed %d\n", 457 - coda_f2s(&cii->c_fid), ret); 456 + pr_err("%s: read dir %s failed %d\n", 457 + __func__, coda_f2s(&cii->c_fid), ret); 458 458 break; 459 459 } 460 460 if (ret == 0) break; /* end of directory file reached */ 461 461 462 462 /* catch truncated reads */ 463 463 if (ret < vdir_size || ret < vdir_size + vdir->d_namlen) { 464 - pr_err("coda readdir: short read on %s\n", 465 - coda_f2s(&cii->c_fid)); 464 + pr_err("%s: short read on %s\n", 465 + __func__, coda_f2s(&cii->c_fid)); 466 466 ret = -EBADF; 467 467 break; 468 468 } 469 469 /* validate whether the directory file actually makes sense */ 470 470 if (vdir->d_reclen < vdir_size + vdir->d_namlen) { 471 - pr_err("coda readdir: invalid dir %s\n", 472 - coda_f2s(&cii->c_fid)); 471 + pr_err("%s: invalid dir %s\n", 472 + __func__, coda_f2s(&cii->c_fid)); 473 473 ret = -EBADF; 474 474 break; 475 475 }
+12 -12
fs/coda/inode.c
··· 119 119 int idx; 120 120 121 121 if (data == NULL) { 122 - pr_warn("coda_read_super: Bad mount data\n"); 122 + pr_warn("%s: Bad mount data\n", __func__); 123 123 return -1; 124 124 } 125 125 126 126 if (data->version != CODA_MOUNT_VERSION) { 127 - pr_warn("coda_read_super: Bad mount version\n"); 127 + pr_warn("%s: Bad mount version\n", __func__); 128 128 return -1; 129 129 } 130 130 ··· 141 141 fdput(f); 142 142 143 143 if (idx < 0 || idx >= MAX_CODADEVS) { 144 - pr_warn("coda_read_super: Bad minor number\n"); 144 + pr_warn("%s: Bad minor number\n", __func__); 145 145 return -1; 146 146 } 147 147 148 148 return idx; 149 149 Ebadf: 150 - pr_warn("coda_read_super: Bad file\n"); 150 + pr_warn("%s: Bad file\n", __func__); 151 151 return -1; 152 152 } 153 153 ··· 168 168 if(idx == -1) 169 169 idx = 0; 170 170 171 - pr_info("coda_read_super: device index: %i\n", idx); 171 + pr_info("%s: device index: %i\n", __func__, idx); 172 172 173 173 vc = &coda_comms[idx]; 174 174 mutex_lock(&vc->vc_mutex); 175 175 176 176 if (!vc->vc_inuse) { 177 - pr_warn("coda_read_super: No pseudo device\n"); 177 + pr_warn("%s: No pseudo device\n", __func__); 178 178 error = -EINVAL; 179 179 goto unlock_out; 180 180 } 181 181 182 182 if (vc->vc_sb) { 183 - pr_warn("coda_read_super: Device already mounted\n"); 183 + pr_warn("%s: Device already mounted\n", __func__); 184 184 error = -EBUSY; 185 185 goto unlock_out; 186 186 } ··· 204 204 /* get root fid from Venus: this needs the root inode */ 205 205 error = venus_rootfid(sb, &fid); 206 206 if ( error ) { 207 - pr_warn("coda_read_super: coda_get_rootfid failed with %d\n", 208 - error); 207 + pr_warn("%s: coda_get_rootfid failed with %d\n", 208 + __func__, error); 209 209 goto error; 210 210 } 211 - pr_info("coda_read_super: rootfid is %s\n", coda_f2s(&fid)); 211 + pr_info("%s: rootfid is %s\n", __func__, coda_f2s(&fid)); 212 212 213 213 /* make root inode */ 214 214 root = coda_cnode_make(&fid, sb); ··· 219 219 goto error; 220 220 } 221 221 222 - pr_info("coda_read_super: rootinode is %ld dev %s\n", 223 - root->i_ino, root->i_sb->s_id); 222 + pr_info("%s: rootinode is %ld dev %s\n", 223 + __func__, root->i_ino, root->i_sb->s_id); 224 224 sb->s_root = d_make_root(root); 225 225 if (!sb->s_root) { 226 226 error = -EINVAL;
+12 -11
fs/coda/psdev.c
··· 136 136 137 137 CODA_FREE(dcbuf, nbytes); 138 138 if (error) { 139 - pr_warn("psdev_write: coda_downcall error: %d\n", 140 - error); 139 + pr_warn("%s: coda_downcall error: %d\n", 140 + __func__, error); 141 141 retval = error; 142 142 goto out; 143 143 } ··· 158 158 mutex_unlock(&vcp->vc_mutex); 159 159 160 160 if (!req) { 161 - pr_warn("psdev_write: msg (%d, %d) not found\n", 162 - hdr.opcode, hdr.unique); 161 + pr_warn("%s: msg (%d, %d) not found\n", 162 + __func__, hdr.opcode, hdr.unique); 163 163 retval = -ESRCH; 164 164 goto out; 165 165 } 166 166 167 167 /* move data into response buffer. */ 168 168 if (req->uc_outSize < nbytes) { 169 - pr_warn("psdev_write: too much cnt: %d, cnt: %ld, opc: %d, uniq: %d.\n", 170 - req->uc_outSize, (long)nbytes, hdr.opcode, hdr.unique); 169 + pr_warn("%s: too much cnt: %d, cnt: %ld, opc: %d, uniq: %d.\n", 170 + __func__, req->uc_outSize, (long)nbytes, 171 + hdr.opcode, hdr.unique); 171 172 nbytes = req->uc_outSize; /* don't have more space! */ 172 173 } 173 174 if (copy_from_user(req->uc_data, buf, nbytes)) { ··· 242 241 /* Move the input args into userspace */ 243 242 count = req->uc_inSize; 244 243 if (nbytes < req->uc_inSize) { 245 - pr_warn("psdev_read: Venus read %ld bytes of %d in message\n", 246 - (long)nbytes, req->uc_inSize); 244 + pr_warn("%s: Venus read %ld bytes of %d in message\n", 245 + __func__, (long)nbytes, req->uc_inSize); 247 246 count = nbytes; 248 247 } 249 248 ··· 307 306 struct upc_req *req, *tmp; 308 307 309 308 if (!vcp || !vcp->vc_inuse ) { 310 - pr_warn("psdev_release: Not open.\n"); 309 + pr_warn("%s: Not open.\n", __func__); 311 310 return -1; 312 311 } 313 312 ··· 356 355 { 357 356 int i, err = 0; 358 357 if (register_chrdev(CODA_PSDEV_MAJOR, "coda", &coda_psdev_fops)) { 359 - pr_err("coda_psdev: unable to get major %d\n", 360 - CODA_PSDEV_MAJOR); 358 + pr_err("%s: unable to get major %d\n", 359 + __func__, CODA_PSDEV_MAJOR); 361 360 return -EIO; 362 361 } 363 362 coda_psdev_class = class_create(THIS_MODULE, "coda");
+2 -2
fs/coda/upcall.c
··· 518 518 &outsize, inp); 519 519 520 520 if (error) { 521 - pr_warn("coda_pioctl: Venus returns: %d for %s\n", 522 - error, coda_f2s(fid)); 521 + pr_warn("%s: Venus returns: %d for %s\n", 522 + __func__, error, coda_f2s(fid)); 523 523 goto exit; 524 524 } 525 525