diff options
| author | Tao Ma <tao.ma@oracle.com> | 2009-08-27 08:46:56 +0200 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2009-08-28 03:10:54 +0200 |
| commit | a1b08e75dff3dc18a88444803753e667bb1d126e (patch) | |
| tree | b782aaa5e2775c693bb711647e9e2b2331003fb4 /fs/ocfs2/dcache.c | |
| parent | ocfs2/dlm: Wait on lockres instead of erroring cancel requests (diff) | |
| download | linux-a1b08e75dff3dc18a88444803753e667bb1d126e.tar.xz linux-a1b08e75dff3dc18a88444803753e667bb1d126e.zip | |
ocfs2: invalidate dentry if its dentry_lock isn't initialized.
In commit a5a0a630922a2f6a774b6dac19f70cb5abd86bb0, when
ocfs2_attch_dentry_lock fails, we call an extra iput and reset
dentry->d_fsdata to NULL. This resolve a bug, but it isn't
completed and the dentry is still there. When we want to use
it again, ocfs2_dentry_revalidate doesn't catch it and return
true. That make future ocfs2_dentry_lock panic out.
One bug is http://oss.oracle.com/bugzilla/show_bug.cgi?id=1162.
The resolution is to add a check for dentry->d_fsdata in
revalidate process and return false if dentry->d_fsdata is NULL,
so that a new ocfs2_lookup will be called again.
Signed-off-by: Tao Ma <tao.ma@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
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: |