ncpfs: switch to %p[dD] (84eb3532) · Commits · e / devices / android_kernel_oneplus_sm8150

fs/ncpfs/dir.c

+20 −35

Original line number	Original line	Diff line number	Diff line
	@@ -339,9 +339,8 @@ ncp_lookup_validate(struct dentry *dentry, unsigned int flags)
	if (val)		if (val)
	goto finished;		goto finished;

	DDPRINTK("ncp_lookup_validate: %s/%s not valid, age=%ld, server lookup\n",		DDPRINTK("ncp_lookup_validate: %pd2 not valid, age=%ld, server lookup\n",
	dentry->d_parent->d_name.name, dentry->d_name.name,		dentry, NCP_GET_AGE(dentry));
	NCP_GET_AGE(dentry));

	len = sizeof(__name);		len = sizeof(__name);
	if (ncp_is_server_root(dir)) {		if (ncp_is_server_root(dir)) {
	@@ -359,8 +358,8 @@ ncp_lookup_validate(struct dentry *dentry, unsigned int flags)
	res = ncp_obtain_info(server, dir, __name, &(finfo.i));		res = ncp_obtain_info(server, dir, __name, &(finfo.i));
	}		}
	finfo.volume = finfo.i.volNumber;		finfo.volume = finfo.i.volNumber;
	DDPRINTK("ncp_lookup_validate: looked for %s/%s, res=%d\n",		DDPRINTK("ncp_lookup_validate: looked for %pd/%s, res=%d\n",
	dentry->d_parent->d_name.name, __name, res);		dentry->d_parent, __name, res);
	/*		/*
	* If we didn't find it, or if it has a different dirEntNum to		* If we didn't find it, or if it has a different dirEntNum to
	* what we remember, it's not valid any more.		* what we remember, it's not valid any more.
	@@ -454,8 +453,7 @@ static int ncp_readdir(struct file file, struct dir_context ctx)
	ctl.page = NULL;		ctl.page = NULL;
	ctl.cache = NULL;		ctl.cache = NULL;

	DDPRINTK("ncp_readdir: reading %s/%s, pos=%d\n",		DDPRINTK("ncp_readdir: reading %pD2, pos=%d\n", file,
	dentry->d_parent->d_name.name, dentry->d_name.name,
	(int) ctx->pos);		(int) ctx->pos);

	result = -EIO;		result = -EIO;
	@@ -740,12 +738,10 @@ ncp_do_readdir(struct file file, struct dir_context ctx,
	int more;		int more;
	size_t bufsize;		size_t bufsize;

	DPRINTK("ncp_do_readdir: %s/%s, fpos=%ld\n",		DPRINTK("ncp_do_readdir: %pD2, fpos=%ld\n", file,
	dentry->d_parent->d_name.name, dentry->d_name.name,
	(unsigned long) ctx->pos);		(unsigned long) ctx->pos);
	PPRINTK("ncp_do_readdir: init %s, volnum=%d, dirent=%u\n",		PPRINTK("ncp_do_readdir: init %pD, volnum=%d, dirent=%u\n",
	dentry->d_name.name, NCP_FINFO(dir)->volNumber,		file, NCP_FINFO(dir)->volNumber, NCP_FINFO(dir)->dirEntNum);
	NCP_FINFO(dir)->dirEntNum);

	err = ncp_initialize_search(server, dir, &seq);		err = ncp_initialize_search(server, dir, &seq);
	if (err) {		if (err) {
	@@ -850,8 +846,7 @@ static struct dentry ncp_lookup(struct inode dir, struct dentry *dentry, unsig
	if (!ncp_conn_valid(server))		if (!ncp_conn_valid(server))
	goto finished;		goto finished;

	PPRINTK("ncp_lookup: server lookup for %s/%s\n",		PPRINTK("ncp_lookup: server lookup for %pd2\n", dentry);
	dentry->d_parent->d_name.name, dentry->d_name.name);

	len = sizeof(__name);		len = sizeof(__name);
	if (ncp_is_server_root(dir)) {		if (ncp_is_server_root(dir)) {
	@@ -867,8 +862,7 @@ static struct dentry ncp_lookup(struct inode dir, struct dentry *dentry, unsig
	if (!res)		if (!res)
	res = ncp_obtain_info(server, dir, __name, &(finfo.i));		res = ncp_obtain_info(server, dir, __name, &(finfo.i));
	}		}
	PPRINTK("ncp_lookup: looked for %s/%s, res=%d\n",		PPRINTK("ncp_lookup: looked for %pd2, res=%d\n", dentry, res);
	dentry->d_parent->d_name.name, __name, res);
	/*		/*
	* If we didn't find an entry, make a negative dentry.		* If we didn't find an entry, make a negative dentry.
	*/		*/
	@@ -915,8 +909,7 @@ static int ncp_instantiate(struct inode dir, struct dentry dentry,
	return error;		return error;

	out_close:		out_close:
	PPRINTK("ncp_instantiate: %s/%s failed, closing file\n",		PPRINTK("ncp_instantiate: %pd2 failed, closing file\n", dentry);
	dentry->d_parent->d_name.name, dentry->d_name.name);
	ncp_close_file(NCP_SERVER(dir), finfo->file_handle);		ncp_close_file(NCP_SERVER(dir), finfo->file_handle);
	goto out;		goto out;
	}		}
	@@ -930,8 +923,7 @@ int ncp_create_new(struct inode dir, struct dentry dentry, umode_t mode,
	int opmode;		int opmode;
	__u8 __name[NCP_MAXPATHLEN + 1];		__u8 __name[NCP_MAXPATHLEN + 1];

	PPRINTK("ncp_create_new: creating %s/%s, mode=%hx\n",		PPRINTK("ncp_create_new: creating %pd2, mode=%hx\n", dentry, mode);
	dentry->d_parent->d_name.name, dentry->d_name.name, mode);

	ncp_age_dentry(server, dentry);		ncp_age_dentry(server, dentry);
	len = sizeof(__name);		len = sizeof(__name);
	@@ -960,8 +952,7 @@ int ncp_create_new(struct inode dir, struct dentry dentry, umode_t mode,
	error = -ENAMETOOLONG;		error = -ENAMETOOLONG;
	else if (result < 0)		else if (result < 0)
	error = result;		error = result;
	DPRINTK("ncp_create: %s/%s failed\n",		DPRINTK("ncp_create: %pd2 failed\n", dentry);
	dentry->d_parent->d_name.name, dentry->d_name.name);
	goto out;		goto out;
	}		}
	opmode = O_WRONLY;		opmode = O_WRONLY;
	@@ -994,8 +985,7 @@ static int ncp_mkdir(struct inode dir, struct dentry dentry, umode_t mode)
	int error, len;		int error, len;
	__u8 __name[NCP_MAXPATHLEN + 1];		__u8 __name[NCP_MAXPATHLEN + 1];

	DPRINTK("ncp_mkdir: making %s/%s\n",		DPRINTK("ncp_mkdir: making %pd2\n", dentry);
	dentry->d_parent->d_name.name, dentry->d_name.name);

	ncp_age_dentry(server, dentry);		ncp_age_dentry(server, dentry);
	len = sizeof(__name);		len = sizeof(__name);
	@@ -1032,8 +1022,7 @@ static int ncp_rmdir(struct inode dir, struct dentry dentry)
	int error, result, len;		int error, result, len;
	__u8 __name[NCP_MAXPATHLEN + 1];		__u8 __name[NCP_MAXPATHLEN + 1];

	DPRINTK("ncp_rmdir: removing %s/%s\n",		DPRINTK("ncp_rmdir: removing %pd2\n", dentry);
	dentry->d_parent->d_name.name, dentry->d_name.name);

	len = sizeof(__name);		len = sizeof(__name);
	error = ncp_io2vol(server, __name, &len, dentry->d_name.name,		error = ncp_io2vol(server, __name, &len, dentry->d_name.name,
	@@ -1078,8 +1067,7 @@ static int ncp_unlink(struct inode dir, struct dentry dentry)
	int error;		int error;

	server = NCP_SERVER(dir);		server = NCP_SERVER(dir);
	DPRINTK("ncp_unlink: unlinking %s/%s\n",		DPRINTK("ncp_unlink: unlinking %pd2\n", dentry);
	dentry->d_parent->d_name.name, dentry->d_name.name);

	/*		/*
	* Check whether to close the file ...		* Check whether to close the file ...
	@@ -1099,8 +1087,7 @@ static int ncp_unlink(struct inode dir, struct dentry dentry)
	#endif		#endif
	switch (error) {		switch (error) {
	case 0x00:		case 0x00:
	DPRINTK("ncp: removed %s/%s\n",		DPRINTK("ncp: removed %pd2\n", dentry);
	dentry->d_parent->d_name.name, dentry->d_name.name);
	break;		break;
	case 0x85:		case 0x85:
	case 0x8A:		case 0x8A:
	@@ -1133,9 +1120,7 @@ static int ncp_rename(struct inode old_dir, struct dentry old_dentry,
	int old_len, new_len;		int old_len, new_len;
	__u8 __old_name[NCP_MAXPATHLEN + 1], __new_name[NCP_MAXPATHLEN + 1];		__u8 __old_name[NCP_MAXPATHLEN + 1], __new_name[NCP_MAXPATHLEN + 1];

	DPRINTK("ncp_rename: %s/%s to %s/%s\n",		DPRINTK("ncp_rename: %pd2 to %pd2\n", old_dentry, new_dentry);
	old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
	new_dentry->d_parent->d_name.name, new_dentry->d_name.name);

	ncp_age_dentry(server, old_dentry);		ncp_age_dentry(server, old_dentry);
	ncp_age_dentry(server, new_dentry);		ncp_age_dentry(server, new_dentry);
	@@ -1165,8 +1150,8 @@ static int ncp_rename(struct inode old_dir, struct dentry old_dentry,
	#endif		#endif
	switch (error) {		switch (error) {
	case 0x00:		case 0x00:
	DPRINTK("ncp renamed %s -> %s.\n",		DPRINTK("ncp renamed %pd -> %pd.\n",
	old_dentry->d_name.name,new_dentry->d_name.name);		old_dentry, new_dentry);
	break;		break;
	case 0x9E:		case 0x9E:
	error = -ENAMETOOLONG;		error = -ENAMETOOLONG;

fs/ncpfs/file.c

+4 −8

Original line number	Original line	Diff line number	Diff line
	@@ -107,8 +107,7 @@ ncp_file_read(struct file file, char __user buf, size_t count, loff_t *ppos)
	void* freepage;		void* freepage;
	size_t freelen;		size_t freelen;

	DPRINTK("ncp_file_read: enter %s/%s\n",		DPRINTK("ncp_file_read: enter %pd2\n", dentry);
	dentry->d_parent->d_name.name, dentry->d_name.name);

	pos = *ppos;		pos = *ppos;

	@@ -166,8 +165,7 @@ ncp_file_read(struct file file, char __user buf, size_t count, loff_t *ppos)

	file_accessed(file);		file_accessed(file);

	DPRINTK("ncp_file_read: exit %s/%s\n",		DPRINTK("ncp_file_read: exit %pd2\n", dentry);
	dentry->d_parent->d_name.name, dentry->d_name.name);
	outrel:		outrel:
	ncp_inode_close(inode);		ncp_inode_close(inode);
	return already_read ? already_read : error;		return already_read ? already_read : error;
	@@ -184,8 +182,7 @@ ncp_file_write(struct file file, const char __user buf, size_t count, loff_t *
	int errno;		int errno;
	void* bouncebuffer;		void* bouncebuffer;

	DPRINTK("ncp_file_write: enter %s/%s\n",		DPRINTK("ncp_file_write: enter %pd2\n", dentry);
	dentry->d_parent->d_name.name, dentry->d_name.name);
	if ((ssize_t) count < 0)		if ((ssize_t) count < 0)
	return -EINVAL;		return -EINVAL;
	pos = *ppos;		pos = *ppos;
	@@ -264,8 +261,7 @@ ncp_file_write(struct file file, const char __user buf, size_t count, loff_t *
	i_size_write(inode, pos);		i_size_write(inode, pos);
	mutex_unlock(&inode->i_mutex);		mutex_unlock(&inode->i_mutex);
	}		}
	DPRINTK("ncp_file_write: exit %s/%s\n",		DPRINTK("ncp_file_write: exit %pd2\n", dentry);
	dentry->d_parent->d_name.name, dentry->d_name.name);
	outrel:		outrel:
	ncp_inode_close(inode);		ncp_inode_close(inode);
	return already_written ? already_written : errno;		return already_written ? already_written : errno;