From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joel Becker Date: Sun, 21 Aug 2011 21:29:11 -0700 Subject: [Ocfs2-devel] [PATCH] ocfs2: make direntry invalid when deleting it In-Reply-To: <201107120843.p6C8hYl5007623@acsmt357.oracle.com> References: <201107120843.p6C8hYl5007623@acsmt357.oracle.com> Message-ID: <20110822042911.GF31134@noexit.corp.google.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ocfs2-devel@oss.oracle.com This patch is now in the fixes branch of ocfs2.git. Joel On Tue, Jul 12, 2011 at 04:43:14PM +0800, Wengang Wang wrote: > When we deleting a direntry from a directory, if it's the first in a block we > invalid it by setting inode to 0; otherwise, we merge the deleted one to the > prior and contiguous direntry. And we don't truncate directories. > > There is a problem for the later case since inode is not set to 0. > This problem happens when the caller passes a file position as parameter to > ocfs2_dir_foreach_blk(). If the position happens to point to a stale(not > the first, deleted in betweens of ocfs2_dir_foreach_blk()s) direntry, we are > not able to recognize its staleness. So that we treat it as a live one wrongly. > > The fix is to set inode to 0 in both cases indicating the direntry is stale. > This won't introduce additional IOs. > > Signed-off-by: Wengang Wang > --- > fs/ocfs2/dir.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c > index 8582e3f..3302088 100644 > --- a/fs/ocfs2/dir.c > +++ b/fs/ocfs2/dir.c > @@ -1184,8 +1184,7 @@ static int __ocfs2_delete_entry(handle_t *handle, struct inode *dir, > if (pde) > le16_add_cpu(&pde->rec_len, > le16_to_cpu(de->rec_len)); > - else > - de->inode = 0; > + de->inode = 0; > dir->i_version++; > ocfs2_journal_dirty(handle, bh); > goto bail; > -- > 1.7.5.2 > > > _______________________________________________ > Ocfs2-devel mailing list > Ocfs2-devel at oss.oracle.com > http://oss.oracle.com/mailman/listinfo/ocfs2-devel -- "What no boss of a programmer can ever understand is that a programmer is working when he's staring out of the window" - With apologies to Burton Rascoe http://www.jlbec.org/ jlbec at evilplan.org