diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-20 16:29:04 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-20 16:29:04 -0800 |
commit | b06ae1ead2915860bb49331e0588aab326801f71 (patch) | |
tree | 4c4861d2212261223915e80d90f10da1c89e2f72 /fs/gfs2/super.c | |
parent | e589501cb928b482c3c399444f788e1af35deee2 (diff) | |
parent | 24d9765fc18c7838ccdbb0d71fb706321d9b824c (diff) | |
download | lwn-b06ae1ead2915860bb49331e0588aab326801f71.tar.gz lwn-b06ae1ead2915860bb49331e0588aab326801f71.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
GFS2: Fix error path in gfs2_lookup_by_inum()
GFS2: remove iopen glocks from cache on failed deletes
Diffstat (limited to 'fs/gfs2/super.c')
-rw-r--r-- | fs/gfs2/super.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 16c2ecac7eb7..ec73ed70bae1 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@ -1336,6 +1336,7 @@ static void gfs2_evict_inode(struct inode *inode) if (error) goto out_truncate; + ip->i_iopen_gh.gh_flags |= GL_NOCACHE; gfs2_glock_dq_wait(&ip->i_iopen_gh); gfs2_holder_reinit(LM_ST_EXCLUSIVE, LM_FLAG_TRY_1CB | GL_NOCACHE, &ip->i_iopen_gh); error = gfs2_glock_nq(&ip->i_iopen_gh); |