Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34a622b2 authored by Harvey Harrison's avatar Harvey Harrison Committed by Lachlan McIlroy
Browse files

[XFS] replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30775a

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent 0225da1f

fs/xfs/linux-2.6/kmem.c

+3 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ kmem_alloc(size_t size, unsigned int __nocast flags) 
#ifdef DEBUG

	if (unlikely(!(flags & KM_LARGE) && (size > PAGE_SIZE))) {

		printk(KERN_WARNING "Large %s attempt, size=%ld\n",

			__FUNCTION__, (long)size);

			__func__, (long)size);

		dump_stack();

	}

#endif
@@ -52,7 +52,7 @@ kmem_alloc(size_t size, unsigned int __nocast flags) 
		if (!(++retries % 100))

			printk(KERN_ERR "XFS: possible memory allocation "

					"deadlock in %s (mode:0x%x)\n",

					__FUNCTION__, lflags);

					__func__, lflags);

		congestion_wait(WRITE, HZ/50);

	} while (1);

}
@@ -129,7 +129,7 @@ kmem_zone_alloc(kmem_zone_t *zone, unsigned int __nocast flags) 
		if (!(++retries % 100))

			printk(KERN_ERR "XFS: possible memory allocation "

					"deadlock in %s (mode:0x%x)\n",

					__FUNCTION__, lflags);

					__func__, lflags);

		congestion_wait(WRITE, HZ/50);

	} while (1);

}

fs/xfs/linux-2.6/xfs_buf.c

+3 −3
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ _xfs_buf_lookup_pages( 
				printk(KERN_ERR

					"XFS: possible memory allocation "

					"deadlock in %s (mode:0x%x)\n",

					__FUNCTION__, gfp_mask);

					__func__, gfp_mask);



			XFS_STATS_INC(xb_page_retries);

			xfsbufd_wakeup(0, gfp_mask);
@@ -598,7 +598,7 @@ xfs_buf_get_flags( 
		error = _xfs_buf_map_pages(bp, flags);

		if (unlikely(error)) {

			printk(KERN_WARNING "%s: failed to map pages\n",

					__FUNCTION__);

					__func__);

			goto no_buffer;

		}

	}
@@ -778,7 +778,7 @@ xfs_buf_get_noaddr( 
	error = _xfs_buf_map_pages(bp, XBF_MAPPED);

	if (unlikely(error)) {

		printk(KERN_WARNING "%s: failed to map pages\n",

				__FUNCTION__);

				__func__);

		goto fail_free_mem;

	}

fs/xfs/linux-2.6/xfs_super.c

+1 −1
Original line number Diff line number Diff line
@@ -935,7 +935,7 @@ xfs_fs_clear_inode( 
		xfs_inactive(ip);

		xfs_iflags_clear(ip, XFS_IMODIFIED);

		if (xfs_reclaim(ip))

			panic("%s: cannot reclaim 0x%p\n", __FUNCTION__, inode);

			panic("%s: cannot reclaim 0x%p\n", __func__, inode);

	}



	ASSERT(XFS_I(inode) == NULL);

fs/xfs/linux-2.6/xfs_vnode.h

+2 −2
Original line number Diff line number Diff line
@@ -288,9 +288,9 @@ extern void xfs_itrace_hold(struct xfs_inode *, char *, int, inst_t *); 
extern void _xfs_itrace_ref(struct xfs_inode *, char *, int, inst_t *);

extern void xfs_itrace_rele(struct xfs_inode *, char *, int, inst_t *);

#define xfs_itrace_entry(ip)	\

	_xfs_itrace_entry(ip, __FUNCTION__, (inst_t *)__return_address)

	_xfs_itrace_entry(ip, __func__, (inst_t *)__return_address)

#define xfs_itrace_exit(ip)	\

	_xfs_itrace_exit(ip, __FUNCTION__, (inst_t *)__return_address)

	_xfs_itrace_exit(ip, __func__, (inst_t *)__return_address)

#define xfs_itrace_exit_tag(ip, tag)	\

	_xfs_itrace_exit(ip, tag, (inst_t *)__return_address)

#define xfs_itrace_ref(ip)	\

fs/xfs/xfs_alloc.c

+9 −9
Original line number Diff line number Diff line
@@ -55,17 +55,17 @@ xfs_alloc_search_busy(xfs_trans_t *tp, 
ktrace_t *xfs_alloc_trace_buf;



#define	TRACE_ALLOC(s,a)	\

	xfs_alloc_trace_alloc(__FUNCTION__, s, a, __LINE__)

	xfs_alloc_trace_alloc(__func__, s, a, __LINE__)

#define	TRACE_FREE(s,a,b,x,f)	\

	xfs_alloc_trace_free(__FUNCTION__, s, mp, a, b, x, f, __LINE__)

	xfs_alloc_trace_free(__func__, s, mp, a, b, x, f, __LINE__)

#define	TRACE_MODAGF(s,a,f)	\

	xfs_alloc_trace_modagf(__FUNCTION__, s, mp, a, f, __LINE__)

#define	TRACE_BUSY(__FUNCTION__,s,ag,agb,l,sl,tp)	\

	xfs_alloc_trace_busy(__FUNCTION__, s, mp, ag, agb, l, sl, tp, XFS_ALLOC_KTRACE_BUSY, __LINE__)

#define	TRACE_UNBUSY(__FUNCTION__,s,ag,sl,tp)	\

	xfs_alloc_trace_busy(__FUNCTION__, s, mp, ag, -1, -1, sl, tp, XFS_ALLOC_KTRACE_UNBUSY, __LINE__)

#define	TRACE_BUSYSEARCH(__FUNCTION__,s,ag,agb,l,sl,tp)	\

	xfs_alloc_trace_busy(__FUNCTION__, s, mp, ag, agb, l, sl, tp, XFS_ALLOC_KTRACE_BUSYSEARCH, __LINE__)

	xfs_alloc_trace_modagf(__func__, s, mp, a, f, __LINE__)

#define	TRACE_BUSY(__func__,s,ag,agb,l,sl,tp)	\

	xfs_alloc_trace_busy(__func__, s, mp, ag, agb, l, sl, tp, XFS_ALLOC_KTRACE_BUSY, __LINE__)

#define	TRACE_UNBUSY(__func__,s,ag,sl,tp)	\

	xfs_alloc_trace_busy(__func__, s, mp, ag, -1, -1, sl, tp, XFS_ALLOC_KTRACE_UNBUSY, __LINE__)

#define	TRACE_BUSYSEARCH(__func__,s,ag,agb,l,sl,tp)	\

	xfs_alloc_trace_busy(__func__, s, mp, ag, agb, l, sl, tp, XFS_ALLOC_KTRACE_BUSYSEARCH, __LINE__)

#else

#define	TRACE_ALLOC(s,a)

#define	TRACE_FREE(s,a,b,x,f)