diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:56:44 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:56:44 +0100 |
| commit | 4045407fd7740642b18bc802e8bab064e79a61e5 (patch) | |
| tree | 9412a38886bfad562bc5897c6e4c23bb88703204 /fs/ocfs2/dir.c | |
| parent | Merge branch 'restart-cleanup' into restart (diff) | |
| parent | Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD (diff) | |
| download | linux-4045407fd7740642b18bc802e8bab064e79a61e5.tar.xz linux-4045407fd7740642b18bc802e8bab064e79a61e5.zip | |
Merge branch 'restart-cleanup' into restart
Conflicts:
arch/arm/kernel/setup.c
Diffstat (limited to 'fs/ocfs2/dir.c')
| -rw-r--r-- | 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 e2878b5895fb..8fe4e2892ab9 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; |