forked from luck/tmp_suning_uos_patched
GFS2: Fix locking bug in rename
The rename code was taking a resource group lock in cases where it wasn't actually needed, this caused problems if the rename was resulting in an inode being unlinked. The patch ensures that we only take the rgrp lock early if it is really needed. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
parent
56aa616a03
commit
24b977b5fd
|
@ -748,7 +748,7 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
|
|||
struct gfs2_rgrpd *nrgd;
|
||||
unsigned int num_gh;
|
||||
int dir_rename = 0;
|
||||
int alloc_required;
|
||||
int alloc_required = 0;
|
||||
unsigned int x;
|
||||
int error;
|
||||
|
||||
|
@ -867,7 +867,9 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
|
|||
goto out_gunlock;
|
||||
}
|
||||
|
||||
alloc_required = error = gfs2_diradd_alloc_required(ndir, &ndentry->d_name);
|
||||
if (nip == NULL)
|
||||
alloc_required = gfs2_diradd_alloc_required(ndir, &ndentry->d_name);
|
||||
error = alloc_required;
|
||||
if (error < 0)
|
||||
goto out_gunlock;
|
||||
error = 0;
|
||||
|
|
Loading…
Reference in New Issue
Block a user