← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to debian/patches/features/all/openvz/0005-ve-Fix-d_path-return-code-when-no-buffer-given.patch

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/features/all/openvz/0005-ve-Fix-d_path-return-code-when-no-buffer-given.patch
1
 
From 469571728098c94c937865548df0b049a5395503 Mon Sep 17 00:00:00 2001
2
 
From: Pavel Emelyanov <xemul@parallels.com>
3
 
Date: Thu, 17 Feb 2011 12:12:23 +0300
4
 
Subject: [PATCH 5/6] ve: Fix d_path return code when no buffer given
5
 
 
6
 
In case we call d_path with NULL buffer (d_root_check) the
7
 
return is *always* NULL, which is not what we actually want...
8
 
 
9
 
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
10
 
---
11
 
 fs/dcache.c |    7 +++++--
12
 
 1 files changed, 5 insertions(+), 2 deletions(-)
13
 
 
14
 
diff --git a/fs/dcache.c b/fs/dcache.c
15
 
index 7fce87d..dc638a3 100644
16
 
--- a/fs/dcache.c
17
 
+++ b/fs/dcache.c
18
 
@@ -2037,7 +2037,7 @@ out:
19
 
        if (deleted && buffer &&
20
 
                        prepend(&end, &buflen, " (deleted)", 10) != 0)
21
 
                goto Elong;
22
 
-out_err:
23
 
+
24
 
        spin_unlock(&vfsmount_lock);
25
 
        return buffer ? retval : NULL;
26
 
 
27
 
@@ -2070,7 +2070,10 @@ global_root:
28
 
 
29
 
 Elong:
30
 
        retval = ERR_PTR(-ENAMETOOLONG);
31
 
-       goto out_err;
32
 
+out_err:
33
 
+       spin_unlock(&vfsmount_lock);
34
 
+       return retval;
35
 
+
36
 
 }
37
 
 EXPORT_SYMBOL(__d_path);
38
 
 
39
 
1.7.4.1
40