← Back to branch summary

~mathiaz/apparmor/ubuntu-mathiaz

« back to all changes in this revision

Viewing changes to kernel-patches/for-mainline/mount-consistent-__d_path.diff

  • Committer: Mathias Gug
  • Date: 2008-02-04 18:57:00 UTC
  • mfrom: (885.1.5 apparmor)
  • Revision ID: mathiaz@ubuntu.com-20080204185700-wwlyq0ksssxclv8w
Merge  ubuntu branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
kernel-patches/for-mainline/mount-consistent-__d_path.diff
20
20
 
21
21
--- a/fs/dcache.c
22
22
+++ b/fs/dcache.c
23
 
@@ -1788,7 +1788,7 @@ static char *__d_path(struct dentry *den
 
23
@@ -1786,7 +1786,7 @@ static char *__d_path(struct dentry *den
24
24
                      struct dentry *root, struct vfsmount *rootmnt,
25
25
                      char *buffer, int buflen, int fail_deleted)
26
26
 {
29
29
 
30
30
        if (buflen < 2)
31
31
                return ERR_PTR(-ENAMETOOLONG);
32
 
@@ -1811,14 +1811,14 @@ static char *__d_path(struct dentry *den
 
32
@@ -1809,14 +1809,14 @@ static char *__d_path(struct dentry *den
33
33
                struct dentry * parent;
34
34
 
35
35
                if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
49
49
                        continue;
50
50
                }
51
51
                parent = dentry->d_parent;
52
 
@@ -1837,6 +1837,8 @@ static char *__d_path(struct dentry *den
 
52
@@ -1835,6 +1835,8 @@ static char *__d_path(struct dentry *den
53
53
                *--buffer = '/';
54
54
 
55
55
 out: