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

Commit 55f78e17 authored by Harvey Harrison's avatar Harvey Harrison Committed by Steve French
Browse files

[CIFS] cifs: replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 7962670e

fs/cifs/cifs_dfs_ref.c

+9 −9
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static char *cifs_get_share_name(const char *node_name) 
	pSep = memchr(UNC+2, '\\', len-2);

	if (!pSep) {

		cERROR(1, ("%s: no server name end in node name: %s",

			__FUNCTION__, node_name));

			__func__, node_name));

		kfree(UNC);

		return NULL;

	}
@@ -84,7 +84,7 @@ static char *cifs_get_share_name(const char *node_name) 
	pSep = memchr(UNC+(pSep-UNC), '\\', len-(pSep-UNC));

	if (!pSep) {

		cERROR(1, ("%s:2 cant find share name in node name: %s",

			__FUNCTION__, node_name));

			__func__, node_name));

		kfree(UNC);

		return NULL;

	}
@@ -127,7 +127,7 @@ static char *compose_mount_options(const char *sb_mountdata, 
	rc = dns_resolve_server_name_to_ip(*devname, &srvIP);

	if (rc != 0) {

		cERROR(1, ("%s: Failed to resolve server part of %s to IP",

			  __FUNCTION__, *devname));

			  __func__, *devname));

		mountdata = ERR_PTR(rc);

		goto compose_mount_options_out;

	}
@@ -181,8 +181,8 @@ static char *compose_mount_options(const char *sb_mountdata, 
		}

	}



	/*cFYI(1,("%s: parent mountdata: %s", __FUNCTION__,sb_mountdata));*/

	/*cFYI(1, ("%s: submount mountdata: %s", __FUNCTION__, mountdata ));*/

	/*cFYI(1,("%s: parent mountdata: %s", __func__,sb_mountdata));*/

	/*cFYI(1, ("%s: submount mountdata: %s", __func__, mountdata ));*/



compose_mount_options_out:

	kfree(srvIP);
@@ -302,7 +302,7 @@ cifs_dfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd) 
	int rc = 0;

	struct vfsmount *mnt = ERR_PTR(-ENOENT);



	cFYI(1, ("in %s", __FUNCTION__));

	cFYI(1, ("in %s", __func__));

	BUG_ON(IS_ROOT(dentry));



	xid = GetXid();
@@ -336,7 +336,7 @@ cifs_dfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd) 
			len = strlen(referrals[i].node_name);

			if (len < 2) {

				cERROR(1, ("%s: Net Address path too short: %s",

					__FUNCTION__, referrals[i].node_name));

					__func__, referrals[i].node_name));

				rc = -EINVAL;

				goto out_err;

			}
@@ -344,7 +344,7 @@ cifs_dfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd) 
						nd->path.dentry,

						referrals[i].node_name);

			cFYI(1, ("%s: cifs_dfs_do_refmount:%s , mnt:%p",

					 __FUNCTION__,

					 __func__,

					referrals[i].node_name, mnt));



			/* complete mount procedure if we accured submount */
@@ -365,7 +365,7 @@ cifs_dfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd) 
	FreeXid(xid);

	free_dfs_info_array(referrals, num_referrals);

	kfree(full_path);

	cFYI(1, ("leaving %s" , __FUNCTION__));

	cFYI(1, ("leaving %s" , __func__));

	return ERR_PTR(rc);

out_err:

	path_put(&nd->path);

fs/cifs/cifsproto.h

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ extern int smb_send(struct socket *, struct smb_hdr *, 
			unsigned int /* length */ , struct sockaddr *);

extern unsigned int _GetXid(void);

extern void _FreeXid(unsigned int);

#define GetXid() (int)_GetXid(); cFYI(1,("CIFS VFS: in %s as Xid: %d with uid: %d",__FUNCTION__, xid,current->fsuid));

#define FreeXid(curr_xid) {_FreeXid(curr_xid); cFYI(1,("CIFS VFS: leaving %s (xid = %d) rc = %d",__FUNCTION__,curr_xid,(int)rc));}

#define GetXid() (int)_GetXid(); cFYI(1,("CIFS VFS: in %s as Xid: %d with uid: %d",__func__, xid,current->fsuid));

#define FreeXid(curr_xid) {_FreeXid(curr_xid); cFYI(1,("CIFS VFS: leaving %s (xid = %d) rc = %d",__func__,curr_xid,(int)rc));}

extern char *build_path_from_dentry(struct dentry *);

extern char *build_wildcard_path_from_dentry(struct dentry *direntry);

/* extern void renew_parental_timestamps(struct dentry *direntry);*/

fs/cifs/dns_resolve.c

+4 −4
Original line number Diff line number Diff line
@@ -77,14 +77,14 @@ dns_resolve_server_name_to_ip(const char *unc, char **ip_addr) 
	/* search for server name delimiter */

	len = strlen(unc);

	if (len < 3) {

		cFYI(1, ("%s: unc is too short: %s", __FUNCTION__, unc));

		cFYI(1, ("%s: unc is too short: %s", __func__, unc));

		return -EINVAL;

	}

	len -= 2;

	name = memchr(unc+2, '\\', len);

	if (!name) {

		cFYI(1, ("%s: probably server name is whole unc: %s",

					__FUNCTION__, unc));

					__func__, unc));

	} else {

		len = (name - unc) - 2/* leading // */;

	}
@@ -104,7 +104,7 @@ dns_resolve_server_name_to_ip(const char *unc, char **ip_addr) 
		if (*ip_addr) {

			memcpy(*ip_addr, rkey->payload.data, len);

			(*ip_addr)[len] = '\0';

			cFYI(1, ("%s: resolved: %s to %s", __FUNCTION__,

			cFYI(1, ("%s: resolved: %s to %s", __func__,

					rkey->description,

					*ip_addr

				));
@@ -114,7 +114,7 @@ dns_resolve_server_name_to_ip(const char *unc, char **ip_addr) 
		}

		key_put(rkey);

	} else {

		cERROR(1, ("%s: unable to resolve: %s", __FUNCTION__, name));

		cERROR(1, ("%s: unable to resolve: %s", __func__, name));

	}



	kfree(name);