diff options
| author |   Jeff Layton <jlayton@redhat.com> | 2011-07-06 08:10:38 -0400 |
|---|---|---|
| committer |   Steve French <sfrench@us.ibm.com> | 2011-07-08 03:51:23 +0000 |
| commit | 04db79b015dafcb79371fda6b5c32ffdbd31a2ff (patch) | |
| tree | eef264d76b4f352d56be896b950631d857ec61b0 /fs/cifs/cifsfs.c | |
| parent | cifs: have cifs_cleanup_volume_info not take a double pointer (diff) | |
| download | linux-dev-04db79b015dafcb79371fda6b5c32ffdbd31a2ff.tar.xz linux-dev-04db79b015dafcb79371fda6b5c32ffdbd31a2ff.zip | |
cifs: factor smb_vol allocation out of cifs_setup_volume_info
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Pavel Shilovsky <piastryyy@gmail.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifsfs.c')
| -rw-r--r-- | fs/cifs/cifsfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index e11b83149833..3e2989976297 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -649,9 +649,9 @@ cifs_do_mount(struct file_system_type *fs_type, cFYI(1, "Devname: %s flags: %d ", dev_name, flags); - rc = cifs_setup_volume_info(&volume_info, (char *)data, dev_name); - if (rc) - return ERR_PTR(rc); + volume_info = cifs_get_volume_info((char *)data, dev_name); + if (IS_ERR(volume_info)) + return ERR_CAST(volume_info); cifs_sb = kzalloc(sizeof(struct cifs_sb_info), GFP_KERNEL); if (cifs_sb == NULL) { |