← Back to branch summary

~ubuntu-branches/ubuntu/vivid/virtualbox-ose/vivid

« back to all changes in this revision

Viewing changes to src/VBox/Additions/linux/sharedfolders/vfsmod.c

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-03-11 17:16:37 UTC
  • mfrom: (0.3.4 upstream) (0.4.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100311171637-43z64ia3ccpj8vqn
Tags: 3.1.4-dfsg-2ubuntu1
https://launchpad.net/bugs/528561
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/535297
* Merge from Debian unstable (LP: #528561), remaining changes:
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
  - Replace *-source packages with transitional packages for *-dkms
* Fix crash in vboxvideo_drm with kernel 2.6.33 / backported drm code
  (LP: #535297)
* Add a list of linux-headers packages to the apport hook
* Update debian/patches/u02-lp-integration.dpatch with a
  DEP-3 compliant header
* Add ${misc:Depends} to virtualbox-ose-source and virtualbox-ose-guest-source
  Depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Additions/linux/sharedfolders/vfsmod.c
286
286
                goto fail3;
287
287
        }
288
288
 
 
289
        if (sf_init_backing_dev(sf_g, info->name)) {
 
290
                err = -EINVAL;
 
291
                LogFunc(("could not init bdi\n"));
 
292
                goto fail4;
 
293
        }
 
294
 
289
295
        sf_init_inode (sf_g, iroot, &fsinfo);
290
296
        SET_INODE_INFO (iroot, sf_i);
291
297
 
297
303
        if (!droot) {
298
304
                err = -ENOMEM;  /* XXX */
299
305
                LogFunc(("d_alloc_root failed\n"));
300
 
                goto fail4;
 
306
                goto fail5;
301
307
        }
302
308
 
303
309
        sb->s_root = droot;
304
310
        SET_GLOB_INFO (sb, sf_g);
305
311
        return 0;
306
312
 
 
313
 fail5:
 
314
        sf_done_backing_dev(sf_g);
307
315
 fail4:
308
316
        iput (iroot);
309
317
 fail3:
371
379
 
372
380
        sf_g = GET_GLOB_INFO (sb);
373
381
        BUG_ON (!sf_g);
 
382
        sf_done_backing_dev(sf_g);
374
383
        sf_glob_free (sf_g);
375
384
}
376
385