git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
fs
/
dcache.c
diff --git
a/fs/dcache.c
b/fs/dcache.c
index
75659a6
..
9e5cd3c
100644
(file)
--- a/
fs/dcache.c
+++ b/
fs/dcache.c
@@
-1910,7
+1910,7
@@
char *__d_path(const struct path *path, struct path *root,
spin_lock(&vfsmount_lock);
prepend(&end, &buflen, "\0", 1);
spin_lock(&vfsmount_lock);
prepend(&end, &buflen, "\0", 1);
- if (
!IS_ROOT(dentry) && d_unhash
ed(dentry) &&
+ if (
d_unlink
ed(dentry) &&
(prepend(&end, &buflen, " (deleted)", 10) != 0))
goto Elong;
(prepend(&end, &buflen, " (deleted)", 10) != 0))
goto Elong;
@@
-2035,7
+2035,7
@@
char *dentry_path(struct dentry *dentry, char *buf, int buflen)
spin_lock(&dcache_lock);
prepend(&end, &buflen, "\0", 1);
spin_lock(&dcache_lock);
prepend(&end, &buflen, "\0", 1);
- if (
!IS_ROOT(dentry) && d_unhash
ed(dentry) &&
+ if (
d_unlink
ed(dentry) &&
(prepend(&end, &buflen, "//deleted", 9) != 0))
goto Elong;
if (buflen < 1)
(prepend(&end, &buflen, "//deleted", 9) != 0))
goto Elong;
if (buflen < 1)
@@
-2097,9
+2097,8
@@
SYSCALL_DEFINE2(getcwd, char __user *, buf, unsigned long, size)
read_unlock(¤t->fs->lock);
error = -ENOENT;
read_unlock(¤t->fs->lock);
error = -ENOENT;
- /* Has the current directory has been unlinked? */
spin_lock(&dcache_lock);
spin_lock(&dcache_lock);
- if (
IS_ROOT(pwd.dentry) || !d_unhash
ed(pwd.dentry)) {
+ if (
!d_unlink
ed(pwd.dentry)) {
unsigned long len;
struct path tmp = root;
char * cwd;
unsigned long len;
struct path tmp = root;
char * cwd;