diff options
| author | Rafael J. Wysocki | 2009-09-10 00:02:02 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki | 2009-09-10 00:02:02 +0200 |
| commit | bf992fa2bc1ad1bb2aeb0bdfadb43f236b9297fd (patch) | |
| tree | d67f525c76b66956ba7ca0d40bc0fcda0e414700 /fs/ocfs2/dcache.c | |
| parent | PM: Run-time PM platform device bus support (diff) | |
| parent | aoe: allocate unused request_queue for sysfs (diff) | |
| download | kernel-qcow2-linux-bf992fa2bc1ad1bb2aeb0bdfadb43f236b9297fd.tar.gz kernel-qcow2-linux-bf992fa2bc1ad1bb2aeb0bdfadb43f236b9297fd.tar.xz kernel-qcow2-linux-bf992fa2bc1ad1bb2aeb0bdfadb43f236b9297fd.zip | |
Merge branch 'master' into for-linus
Diffstat (limited to 'fs/ocfs2/dcache.c')
| -rw-r--r-- | fs/ocfs2/dcache.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/fs/ocfs2/dcache.c b/fs/ocfs2/dcache.c index 2f28b7de2c8d..b4957c7d9fe2 100644 --- a/fs/ocfs2/dcache.c +++ b/fs/ocfs2/dcache.c @@ -85,6 +85,17 @@ static int ocfs2_dentry_revalidate(struct dentry *dentry, goto bail; } + /* + * If the last lookup failed to create dentry lock, let us + * redo it. + */ + if (!dentry->d_fsdata) { + mlog(0, "Inode %llu doesn't have dentry lock, " + "returning false\n", + (unsigned long long)OCFS2_I(inode)->ip_blkno); + goto bail; + } + ret = 1; bail: |