← 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/shared/compat_namei.h

  • Committer: Bazaar Package Importer
  • Author(s): Serge Hallyn
  • Date: 2011-03-31 14:20:05 UTC
  • mfrom: (1.4.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110331142005-3n9red91p7ogkweo
Tags: 2011.03.28-387002-0ubuntu1
https://launchpad.net/bugs/727342
https://launchpad.net/bugs/332323
https://launchpad.net/bugs/332323
* Merge latest upstream git tag.  This has the unlocked_ioctl change
  needed to fix dkms build failures (LP: #727342)
* Changes in debian/rules:
  - work around a bug in toolbox/Makefile, where install-exec-hook is
    not happening.  This needs to get fixed the right way.
  - don't install 'vmware-user' which seems to no longer exist
  - move /etc/xdg into open-vm-toolbox (which should be done using .install)
* debian/open-vm-tools.init: add 'modprobe [-r] vmblock'. (LP: #332323)
* debian/rules and debian/open-vm-toolbox.lintian-overrides:
  - Make vmware-user-suid-wrapper suid-root (LP: #332323)

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/linux/shared/compat_namei.h
19
19
#ifndef __COMPAT_NAMEI_H__
20
20
#   define __COMPAT_NAMEI_H__
21
21
 
22
 
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 18)
23
22
#include <linux/namei.h>
24
 
#endif
25
23
 
26
24
/*
27
25
 * In 2.6.25-rc2, dentry and mount objects were removed from the nameidata
40
38
#define compat_path_release(nd) path_release(nd)
41
39
#endif
42
40
 
43
 
/* path_lookup was exported in 2.4.25 */
44
 
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 25)
45
 
#define compat_path_lookup(path, flags, nd)     path_lookup(path, flags, nd)
 
41
/* path_lookup was removed in 2.6.39 merge window VFS merge */
 
42
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
 
43
#define compat_path_lookup(name, flags, nd)     kern_path(name, flags, &((nd)->path))
46
44
#else
47
 
#define compat_path_lookup(path, flags, nd)     \
48
 
         ({                                     \
49
 
            int ret = 0;                        \
50
 
            if (path_init(path, flags, nd)) {   \
51
 
               ret = path_walk(path, nd);       \
52
 
            }                                   \
53
 
            ret;                                \
54
 
         })
 
45
#define compat_path_lookup(name, flags, nd)     path_lookup(name, flags, nd)
55
46
#endif
56
47
 
57
48
#endif /* __COMPAT_NAMEI_H__ */