diff options
| author | Ronnie Sahlberg <lsahlber@redhat.com> | 2020-12-10 09:08:43 +0300 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2020-12-14 04:12:07 +0300 |
| commit | 4deb075985ec52961cf43666cd9e12af1241b3cf (patch) | |
| tree | 13f7d337148f469541309ac988296d3d61f47b60 /fs/cifs/connect.c | |
| parent | 24e0a1eff9e2b9835a6e7c17039dfb6ecfd81f1f (diff) | |
| download | linux-4deb075985ec52961cf43666cd9e12af1241b3cf.tar.xz | |
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>
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 1c463ca16226..ec3c952b90f2 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -3032,11 +3032,8 @@ expand_dfs_referral(const unsigned int xid, struct cifs_ses *ses, rc = dfs_cache_find(xid, ses, cifs_sb->local_nls, cifs_remap(cifs_sb), ref_path, &referral, NULL); if (!rc) { - char *fake_devname = NULL; - mdata = cifs_compose_mount_options(cifs_sb->mountdata, - full_path + 1, &referral, - &fake_devname); + full_path + 1, &referral); free_dfs_info_param(&referral); if (IS_ERR(mdata)) { @@ -3046,7 +3043,6 @@ expand_dfs_referral(const unsigned int xid, struct cifs_ses *ses, cifs_cleanup_volume_info_contents(ctx); rc = cifs_setup_volume_info(ctx); } - kfree(fake_devname); kfree(cifs_sb->mountdata); cifs_sb->mountdata = mdata; } @@ -3098,7 +3094,7 @@ static int setup_dfs_tgt_conn(const char *path, const char *full_path, { int rc; struct dfs_info3_param ref = {0}; - char *mdata = NULL, *fake_devname = NULL; + char *mdata = NULL; struct smb3_fs_context fake_ctx = {NULL}; cifs_dbg(FYI, "%s: dfs path: %s\n", __func__, path); @@ -3107,7 +3103,7 @@ static int setup_dfs_tgt_conn(const char *path, const char *full_path, if (rc) return rc; - mdata = cifs_compose_mount_options(cifs_sb->mountdata, full_path + 1, &ref, &fake_devname); + mdata = cifs_compose_mount_options(cifs_sb->mountdata, full_path + 1, &ref); free_dfs_info_param(&ref); if (IS_ERR(mdata)) { @@ -3117,7 +3113,6 @@ static int setup_dfs_tgt_conn(const char *path, const char *full_path, rc = cifs_setup_volume_info(&fake_ctx); kfree(mdata); - kfree(fake_devname); if (!rc) { /* |