← Back to branch summary

~ubuntu-branches/ubuntu/quantal/open-vm-tools/quantal-201210021442

« back to all changes in this revision

Viewing changes to modules/linux/vmblock/linux/filesystem.c

  • Committer: Package Import Robot
  • Author(s): Nate Muench
  • Date: 2012-06-20 15:59:51 UTC
  • mfrom: (1.4.8)
  • Revision ID: package-import@ubuntu.com-20120620155951-6rupmpb0f70b52zr
Tags: 2012.05.21-724730-0ubuntu1
https://launchpad.net/bugs/1000344
https://launchpad.net/bugs/1019031
* Merging upstream version 2012.05.21-724730.
  - Fixes building against the current Quantal kernel. (LP: #1000344)
  - Fixes Quantal installation issues. (LP: #1019031)

* Sync with Debian
  - Updating to debhelper version 9.
  - Updating to standards version 3.9.3.
  - Updating copyright file machine-readable format version 1.0.
  - Building without multiarch paths for now

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/linux/vmblock/linux/filesystem.c
28
28
#include <linux/module.h>
29
29
#include <linux/proc_fs.h>
30
30
#include <linux/mount.h>
31
 
#include <linux/fs.h>
32
31
 
 
32
#include "compat_fs.h"
33
33
#include "compat_namei.h"
34
34
 
35
35
#include "os.h"
525
525
      return -EINVAL;
526
526
   }
527
527
 
528
 
   rootDentry = d_alloc_root(rootInode);
 
528
   rootDentry = d_make_root(rootInode);
529
529
   if (!rootDentry) {
530
 
      iput(rootInode);
531
530
      return -ENOMEM;
532
531
   }
533
532
   sb->s_root = rootDentry;