diff options
| author | Bob Peterson <rpeterso@redhat.com> | 2010-04-14 11:58:16 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2010-04-14 16:48:05 +0100 |
| commit | 1a0eae8848cde6e0734360f6456496c995ee1e23 (patch) | |
| tree | 536f944468ef5bc6f47ec09325422adbc5a3907a /fs/gfs2/glock.c | |
| parent | 602c89d2e3e8652f94a697c9a919be739b9bcdd5 (diff) | |
| download | op-kernel-dev-1a0eae8848cde6e0734360f6456496c995ee1e23.zip op-kernel-dev-1a0eae8848cde6e0734360f6456496c995ee1e23.tar.gz | |
GFS2: glock livelock
This patch fixes a couple gfs2 problems with the reclaiming of
unlinked dinodes. First, there were a couple of livelocks where
everything would come to a halt waiting for a glock that was
seemingly held by a process that no longer existed. In fact, the
process did exist, it just had the wrong pid number in the holder
information. Second, there was a lock ordering problem between
inode locking and glock locking. Third, glock/inode contention
could sometimes cause inodes to be improperly marked invalid by
iget_failed.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Diffstat (limited to 'fs/gfs2/glock.c')
| -rw-r--r-- | fs/gfs2/glock.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index 454d4b4..ddcdbf4 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c @@ -855,6 +855,9 @@ void gfs2_holder_reinit(unsigned int state, unsigned flags, struct gfs2_holder * gh->gh_flags = flags; gh->gh_iflags = 0; gh->gh_ip = (unsigned long)__builtin_return_address(0); + if (gh->gh_owner_pid) + put_pid(gh->gh_owner_pid); + gh->gh_owner_pid = get_pid(task_pid(current)); } /** |
