diff options
| author | Bob Peterson <rpeterso@redhat.com> | 2014-09-29 08:52:04 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2014-10-01 14:06:15 +0100 |
| commit | 19aeb5a65f1a6504fc665466c188241e7393d66f (patch) | |
| tree | ed2f2cb66536ab4dfa5b1c2bffe9780889ad369c /fs/gfs2/dir.c | |
| parent | 00a158be83839f2d5370612d633eb2643ddf844e (diff) | |
| download | op-kernel-dev-19aeb5a65f1a6504fc665466c188241e7393d66f.zip op-kernel-dev-19aeb5a65f1a6504fc665466c188241e7393d66f.tar.gz | |
GFS2: Make rename not save dirent location
This patch fixes a regression in the patch "GFS2: Remember directory
insert point", commit 2b47dad866d04f14c328f888ba5406057b8c7d33.
The problem had to do with the rename function: The function found
space for the new dirent, and remembered that location. But then the
old dirent was removed, which often moved the eligible location for
the renamed dirent. Putting the new dirent at the saved location
caused file system corruption.
This patch adds a new "save_loc" variable to struct gfs2_diradd.
If 1, the dirent location is saved. If 0, the dirent location is not
saved and the buffer_head is released as per previous behavior.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/dir.c')
| -rw-r--r-- | fs/gfs2/dir.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c index 1a349f9..5d4261ff5 100644 --- a/fs/gfs2/dir.c +++ b/fs/gfs2/dir.c @@ -2100,8 +2100,13 @@ int gfs2_diradd_alloc_required(struct inode *inode, const struct qstr *name, } if (IS_ERR(dent)) return PTR_ERR(dent); - da->bh = bh; - da->dent = dent; + + if (da->save_loc) { + da->bh = bh; + da->dent = dent; + } else { + brelse(bh); + } return 0; } |
