diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-28 05:16:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 11:58:45 -0400 |
commit | 9746077a71d01b8d86f5e471a3a2c8f1fa91ef94 (patch) | |
tree | b6a4b12949b29144ab2092bb5ccac15971a071e4 /fs/ufs/dir.c | |
parent | 3c5afae2bac974fe2c15cd9439f921526b3ea2d7 (diff) |
ufs: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Jan Engelhardt <jengelh@linux01.gwdg.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ufs/dir.c')
-rw-r--r-- | fs/ufs/dir.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c index ef563fc8d72c..df0bef18742d 100644 --- a/fs/ufs/dir.c +++ b/fs/ufs/dir.c | |||
@@ -179,7 +179,7 @@ bad_entry: | |||
179 | goto fail; | 179 | goto fail; |
180 | Eend: | 180 | Eend: |
181 | p = (struct ufs_dir_entry *)(kaddr + offs); | 181 | p = (struct ufs_dir_entry *)(kaddr + offs); |
182 | ufs_error(sb, __FUNCTION__, | 182 | ufs_error(sb, __func__, |
183 | "entry in directory #%lu spans the page boundary" | 183 | "entry in directory #%lu spans the page boundary" |
184 | "offset=%lu", | 184 | "offset=%lu", |
185 | dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs); | 185 | dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs); |
@@ -284,7 +284,7 @@ struct ufs_dir_entry *ufs_find_entry(struct inode *dir, struct dentry *dentry, | |||
284 | kaddr += ufs_last_byte(dir, n) - reclen; | 284 | kaddr += ufs_last_byte(dir, n) - reclen; |
285 | while ((char *) de <= kaddr) { | 285 | while ((char *) de <= kaddr) { |
286 | if (de->d_reclen == 0) { | 286 | if (de->d_reclen == 0) { |
287 | ufs_error(dir->i_sb, __FUNCTION__, | 287 | ufs_error(dir->i_sb, __func__, |
288 | "zero-length directory entry"); | 288 | "zero-length directory entry"); |
289 | ufs_put_page(page); | 289 | ufs_put_page(page); |
290 | goto out; | 290 | goto out; |
@@ -356,7 +356,7 @@ int ufs_add_link(struct dentry *dentry, struct inode *inode) | |||
356 | goto got_it; | 356 | goto got_it; |
357 | } | 357 | } |
358 | if (de->d_reclen == 0) { | 358 | if (de->d_reclen == 0) { |
359 | ufs_error(dir->i_sb, __FUNCTION__, | 359 | ufs_error(dir->i_sb, __func__, |
360 | "zero-length directory entry"); | 360 | "zero-length directory entry"); |
361 | err = -EIO; | 361 | err = -EIO; |
362 | goto out_unlock; | 362 | goto out_unlock; |
@@ -456,7 +456,7 @@ ufs_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
456 | struct page *page = ufs_get_page(inode, n); | 456 | struct page *page = ufs_get_page(inode, n); |
457 | 457 | ||
458 | if (IS_ERR(page)) { | 458 | if (IS_ERR(page)) { |
459 | ufs_error(sb, __FUNCTION__, | 459 | ufs_error(sb, __func__, |
460 | "bad page in #%lu", | 460 | "bad page in #%lu", |
461 | inode->i_ino); | 461 | inode->i_ino); |
462 | filp->f_pos += PAGE_CACHE_SIZE - offset; | 462 | filp->f_pos += PAGE_CACHE_SIZE - offset; |
@@ -475,7 +475,7 @@ ufs_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
475 | limit = kaddr + ufs_last_byte(inode, n) - UFS_DIR_REC_LEN(1); | 475 | limit = kaddr + ufs_last_byte(inode, n) - UFS_DIR_REC_LEN(1); |
476 | for ( ;(char*)de <= limit; de = ufs_next_entry(sb, de)) { | 476 | for ( ;(char*)de <= limit; de = ufs_next_entry(sb, de)) { |
477 | if (de->d_reclen == 0) { | 477 | if (de->d_reclen == 0) { |
478 | ufs_error(sb, __FUNCTION__, | 478 | ufs_error(sb, __func__, |
479 | "zero-length directory entry"); | 479 | "zero-length directory entry"); |
480 | ufs_put_page(page); | 480 | ufs_put_page(page); |
481 | return -EIO; | 481 | return -EIO; |
@@ -536,7 +536,7 @@ int ufs_delete_entry(struct inode *inode, struct ufs_dir_entry *dir, | |||
536 | 536 | ||
537 | while ((char*)de < (char*)dir) { | 537 | while ((char*)de < (char*)dir) { |
538 | if (de->d_reclen == 0) { | 538 | if (de->d_reclen == 0) { |
539 | ufs_error(inode->i_sb, __FUNCTION__, | 539 | ufs_error(inode->i_sb, __func__, |
540 | "zero-length directory entry"); | 540 | "zero-length directory entry"); |
541 | err = -EIO; | 541 | err = -EIO; |
542 | goto out; | 542 | goto out; |
@@ -633,7 +633,7 @@ int ufs_empty_dir(struct inode * inode) | |||
633 | 633 | ||
634 | while ((char *)de <= kaddr) { | 634 | while ((char *)de <= kaddr) { |
635 | if (de->d_reclen == 0) { | 635 | if (de->d_reclen == 0) { |
636 | ufs_error(inode->i_sb, __FUNCTION__, | 636 | ufs_error(inode->i_sb, __func__, |
637 | "zero-length directory entry: " | 637 | "zero-length directory entry: " |
638 | "kaddr=%p, de=%p\n", kaddr, de); | 638 | "kaddr=%p, de=%p\n", kaddr, de); |
639 | goto not_empty; | 639 | goto not_empty; |