tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

cifs: remove the devname argument to cifs_compose_mount_options

none of the callers use this argument any more.

Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>

authored by

Ronnie Sahlberg and committed by
Steve French 4deb0759 24e0a1ef

+9 -22
+3 -8
fs/cifs/cifs_dfs_ref.c
··· 124 124 * @sb_mountdata: parent/root DFS mount options (template) 125 125 * @fullpath: full path in UNC format 126 126 * @ref: optional server's referral 127 - * @devname: optional pointer for saving device name 128 127 * 129 128 * creates mount options for submount based on template options sb_mountdata 130 129 * and replacing unc,ip,prefixpath options with ones we've got form ref_unc. ··· 133 134 */ 134 135 char *cifs_compose_mount_options(const char *sb_mountdata, 135 136 const char *fullpath, 136 - const struct dfs_info3_param *ref, 137 - char **devname) 137 + const struct dfs_info3_param *ref) 138 138 { 139 139 int rc; 140 140 char *name; ··· 230 232 strcat(mountdata, "ip="); 231 233 strcat(mountdata, srvIP); 232 234 233 - if (devname) 234 - *devname = name; 235 - else 236 - kfree(name); 235 + kfree(name); 237 236 238 237 /*cifs_dbg(FYI, "%s: parent mountdata: %s\n", __func__, sb_mountdata);*/ 239 238 /*cifs_dbg(FYI, "%s: submount mountdata: %s\n", __func__, mountdata );*/ ··· 276 281 277 282 /* strip first '\' from fullpath */ 278 283 mountdata = cifs_compose_mount_options(cifs_sb->mountdata, 279 - fullpath + 1, NULL, NULL); 284 + fullpath + 1, NULL); 280 285 if (IS_ERR(mountdata)) { 281 286 kfree(devname); 282 287 return (struct vfsmount *)mountdata;
+1 -2
fs/cifs/cifsproto.h
··· 78 78 int add_treename); 79 79 extern char *build_wildcard_path_from_dentry(struct dentry *direntry); 80 80 extern char *cifs_compose_mount_options(const char *sb_mountdata, 81 - const char *fullpath, const struct dfs_info3_param *ref, 82 - char **devname); 81 + const char *fullpath, const struct dfs_info3_param *ref); 83 82 /* extern void renew_parental_timestamps(struct dentry *direntry);*/ 84 83 extern struct mid_q_entry *AllocMidQEntry(const struct smb_hdr *smb_buffer, 85 84 struct TCP_Server_Info *server);
+3 -8
fs/cifs/connect.c
··· 3032 3032 rc = dfs_cache_find(xid, ses, cifs_sb->local_nls, cifs_remap(cifs_sb), 3033 3033 ref_path, &referral, NULL); 3034 3034 if (!rc) { 3035 - char *fake_devname = NULL; 3036 - 3037 3035 mdata = cifs_compose_mount_options(cifs_sb->mountdata, 3038 - full_path + 1, &referral, 3039 - &fake_devname); 3036 + full_path + 1, &referral); 3040 3037 free_dfs_info_param(&referral); 3041 3038 3042 3039 if (IS_ERR(mdata)) { ··· 3043 3046 cifs_cleanup_volume_info_contents(ctx); 3044 3047 rc = cifs_setup_volume_info(ctx); 3045 3048 } 3046 - kfree(fake_devname); 3047 3049 kfree(cifs_sb->mountdata); 3048 3050 cifs_sb->mountdata = mdata; 3049 3051 } ··· 3094 3098 { 3095 3099 int rc; 3096 3100 struct dfs_info3_param ref = {0}; 3097 - char *mdata = NULL, *fake_devname = NULL; 3101 + char *mdata = NULL; 3098 3102 struct smb3_fs_context fake_ctx = {NULL}; 3099 3103 3100 3104 cifs_dbg(FYI, "%s: dfs path: %s\n", __func__, path); ··· 3103 3107 if (rc) 3104 3108 return rc; 3105 3109 3106 - mdata = cifs_compose_mount_options(cifs_sb->mountdata, full_path + 1, &ref, &fake_devname); 3110 + mdata = cifs_compose_mount_options(cifs_sb->mountdata, full_path + 1, &ref); 3107 3111 free_dfs_info_param(&ref); 3108 3112 3109 3113 if (IS_ERR(mdata)) { ··· 3113 3117 rc = cifs_setup_volume_info(&fake_ctx); 3114 3118 3115 3119 kfree(mdata); 3116 - kfree(fake_devname); 3117 3120 3118 3121 if (!rc) { 3119 3122 /*
+2 -4
fs/cifs/dfs_cache.c
··· 1416 1416 int rc; 1417 1417 struct cache_entry *ce; 1418 1418 struct dfs_info3_param ref = {0}; 1419 - char *mdata = NULL, *devname = NULL; 1419 + char *mdata = NULL; 1420 1420 struct TCP_Server_Info *server; 1421 1421 struct cifs_ses *ses; 1422 1422 struct smb3_fs_context ctx = {NULL}; ··· 1443 1443 1444 1444 up_read(&htable_rw_lock); 1445 1445 1446 - mdata = cifs_compose_mount_options(vi->mntdata, rpath, &ref, 1447 - &devname); 1446 + mdata = cifs_compose_mount_options(vi->mntdata, rpath, &ref); 1448 1447 free_dfs_info_param(&ref); 1449 1448 1450 1449 if (IS_ERR(mdata)) { ··· 1453 1454 } 1454 1455 1455 1456 rc = cifs_setup_volume_info(&ctx); 1456 - kfree(devname); 1457 1457 1458 1458 if (rc) { 1459 1459 ses = ERR_PTR(rc);