diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-01-29 09:38:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-01-29 09:38:32 +1000 |
| commit | a5bd4f8ab0443ea62be34b112eb78cafb6b3042d (patch) | |
| tree | df3357914d967c2cf4619dbd14f4609daf406a15 /fs/dcache.c | |
| parent | dee13f12f6ab0c0927adf9168dfc84da93fc9f13 (diff) | |
| parent | bed86f15bdc23436fb30d09e2faa3dfb7d3834e1 (diff) | |
Merge branch 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-next
Just one-liner which corrects a select statement for DRM_KMS_FB_HELPER
which looks like it was missed in the initial merge. Based on 3.13.
* 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox: (55 commits)
DRM: armada: fix missing DRM_KMS_FB_HELPER select
Diffstat (limited to 'fs/dcache.c')
| -rw-r--r-- | fs/dcache.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 6055d61811d..cb4a1069086 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -3061,8 +3061,13 @@ char *d_path(const struct path *path, char *buf, int buflen) * thus don't need to be hashed. They also don't need a name until a * user wants to identify the object in /proc/pid/fd/. The little hack * below allows us to generate a name for these objects on demand: + * + * Some pseudo inodes are mountable. When they are mounted + * path->dentry == path->mnt->mnt_root. In that case don't call d_dname + * and instead have d_path return the mounted path. */ - if (path->dentry->d_op && path->dentry->d_op->d_dname) + if (path->dentry->d_op && path->dentry->d_op->d_dname && + (!IS_ROOT(path->dentry) || path->dentry != path->mnt->mnt_root)) return path->dentry->d_op->d_dname(path->dentry, buf, buflen); rcu_read_lock(); |