Commit 8e33cf20 authored by Al Viro's avatar Al Viro Committed by Steve French
Browse files

cifs: make build_path_from_dentry() return const char * 



... and adjust the callers.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent f6f1f179

fs/cifs/cifsproto.h

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ extern int init_cifs_idmap(void); 
extern void exit_cifs_idmap(void);

extern int init_cifs_spnego(void);

extern void exit_cifs_spnego(void);

extern char *build_path_from_dentry(struct dentry *);

extern const char *build_path_from_dentry(struct dentry *);

extern char *build_path_from_dentry_optional_prefix(struct dentry *direntry,

						    bool prefix);

extern char *cifs_build_path_to_root(struct smb3_fs_context *ctx,

fs/cifs/dir.c

+4 −4
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ cifs_build_path_to_root(struct smb3_fs_context *ctx, struct cifs_sb_info *cifs_s 
}



/* Note: caller must free return buffer */

char *

const char *

build_path_from_dentry(struct dentry *direntry)

{

	struct cifs_sb_info *cifs_sb = CIFS_SB(direntry->d_sb);
@@ -233,7 +233,7 @@ cifs_do_create(struct inode *inode, struct dentry *direntry, unsigned int xid, 
	int desired_access;

	struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);

	struct cifs_tcon *tcon = tlink_tcon(tlink);

	char *full_path = NULL;

	const char *full_path = NULL;

	FILE_ALL_INFO *buf = NULL;

	struct inode *newinode = NULL;

	int disposition;
@@ -619,7 +619,7 @@ int cifs_mknod(struct user_namespace *mnt_userns, struct inode *inode, 
	struct cifs_sb_info *cifs_sb;

	struct tcon_link *tlink;

	struct cifs_tcon *tcon;

	char *full_path = NULL;

	const char *full_path = NULL;



	if (!old_valid_dev(device_number))

		return -EINVAL;
@@ -660,7 +660,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, 
	struct tcon_link *tlink;

	struct cifs_tcon *pTcon;

	struct inode *newInode = NULL;

	char *full_path = NULL;

	const char *full_path = NULL;



	xid = get_xid();

fs/cifs/file.c

+4 −4
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ int cifs_open(struct inode *inode, struct file *file) 
	struct cifs_tcon *tcon;

	struct tcon_link *tlink;

	struct cifsFileInfo *cfile = NULL;

	char *full_path = NULL;

	const char *full_path = NULL;

	bool posix_open_ok = false;

	struct cifs_fid fid;

	struct cifs_pending_open open;
@@ -689,7 +689,7 @@ cifs_reopen_file(struct cifsFileInfo *cfile, bool can_flush) 
	struct TCP_Server_Info *server;

	struct cifsInodeInfo *cinode;

	struct inode *inode;

	char *full_path = NULL;

	const char *full_path = NULL;

	int desired_access;

	int disposition = FILE_OPEN;

	int create_options = CREATE_NOT_DIR;
@@ -2072,7 +2072,7 @@ cifs_get_writable_path(struct cifs_tcon *tcon, const char *name, 
	struct list_head *tmp;

	struct cifsFileInfo *cfile;

	struct cifsInodeInfo *cinode;

	char *full_path;

	const char *full_path;



	*ret_file = NULL;
@@ -2107,7 +2107,7 @@ cifs_get_readable_path(struct cifs_tcon *tcon, const char *name, 
	struct list_head *tmp;

	struct cifsFileInfo *cfile;

	struct cifsInodeInfo *cinode;

	char *full_path;

	const char *full_path;



	*ret_file = NULL;

fs/cifs/inode.c

+8 −8
Original line number Diff line number Diff line
@@ -1609,7 +1609,7 @@ int cifs_unlink(struct inode *dir, struct dentry *dentry) 
{

	int rc = 0;

	unsigned int xid;

	char *full_path = NULL;

	const char *full_path = NULL;

	struct inode *inode = d_inode(dentry);

	struct cifsInodeInfo *cifs_inode;

	struct super_block *sb = dir->i_sb;
@@ -1866,7 +1866,7 @@ int cifs_mkdir(struct user_namespace *mnt_userns, struct inode *inode, 
	struct tcon_link *tlink;

	struct cifs_tcon *tcon;

	struct TCP_Server_Info *server;

	char *full_path;

	const char *full_path;



	cifs_dbg(FYI, "In cifs_mkdir, mode = %04ho inode = 0x%p\n",

		 mode, inode);
@@ -1938,7 +1938,7 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry) 
	struct tcon_link *tlink;

	struct cifs_tcon *tcon;

	struct TCP_Server_Info *server;

	char *full_path = NULL;

	const char *full_path = NULL;

	struct cifsInodeInfo *cifsInode;



	cifs_dbg(FYI, "cifs_rmdir, inode = 0x%p\n", inode);
@@ -2072,8 +2072,8 @@ cifs_rename2(struct user_namespace *mnt_userns, struct inode *source_dir, 
	     struct dentry *source_dentry, struct inode *target_dir,

	     struct dentry *target_dentry, unsigned int flags)

{

	char *from_name = NULL;

	char *to_name = NULL;

	const char *from_name = NULL;

	const char *to_name = NULL;

	struct cifs_sb_info *cifs_sb;

	struct tcon_link *tlink;

	struct cifs_tcon *tcon;
@@ -2317,7 +2317,7 @@ int cifs_revalidate_dentry_attr(struct dentry *dentry) 
	int rc = 0;

	struct inode *inode = d_inode(dentry);

	struct super_block *sb = dentry->d_sb;

	char *full_path = NULL;

	const char *full_path = NULL;

	int count = 0;



	if (inode == NULL)
@@ -2613,7 +2613,7 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs) 
{

	int rc;

	unsigned int xid;

	char *full_path = NULL;

	const char *full_path = NULL;

	struct inode *inode = d_inode(direntry);

	struct cifsInodeInfo *cifsInode = CIFS_I(inode);

	struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
@@ -2764,7 +2764,7 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs) 
	struct cifsInodeInfo *cifsInode = CIFS_I(inode);

	struct cifsFileInfo *wfile;

	struct cifs_tcon *tcon;

	char *full_path = NULL;

	const char *full_path = NULL;

	int rc = -EACCES;

	__u32 dosattr = 0;

	__u64 mode = NO_CHANGE_64;

fs/cifs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static long cifs_ioctl_query_info(unsigned int xid, struct file *filep, 
	struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);

	struct cifs_tcon *tcon = cifs_sb_master_tcon(cifs_sb);

	struct dentry *dentry = filep->f_path.dentry;

	unsigned char *path;

	const unsigned char *path;

	__le16 *utf16_path = NULL, root_path;

	int rc = 0;