diff options
| author | S. Wendy Cheng | 2007-01-18 22:07:03 +0100 |
|---|---|---|
| committer | Steven Whitehouse | 2007-02-05 19:36:31 +0100 |
| commit | 87d21e07f3880b8d489f0b4a639deb1362101838 (patch) | |
| tree | 20b41fc6dad45363b81a9e44daf5b278f532f183 /fs/gfs2/inode.h | |
| parent | [GFS2] BZ 217008 fsfuzzer fix. (diff) | |
| download | kernel-qcow2-linux-87d21e07f3880b8d489f0b4a639deb1362101838.tar.gz kernel-qcow2-linux-87d21e07f3880b8d489f0b4a639deb1362101838.tar.xz kernel-qcow2-linux-87d21e07f3880b8d489f0b4a639deb1362101838.zip | |
[GFS2] Fix gfs2_rename deadlock
Second round of gfs2_rename lock re-ordering to allow Anaconda adding
root partition on top of gfs2. Previous to this patch the recursive
lock detector in glock.c can be triggered due to attempting to lock
the rgrp twice. This fixes it by checking to see whether the rgrp
is already locked.
This fixes Red Hat bugzilla #221237
Signed-off-by: S. Wendy Cheng <wcheng@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/inode.h')
| -rw-r--r-- | fs/gfs2/inode.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/inode.h b/fs/gfs2/inode.h index 85c67cb568d1..cee281b5326b 100644 --- a/fs/gfs2/inode.h +++ b/fs/gfs2/inode.h @@ -40,7 +40,7 @@ int gfs2_inode_refresh(struct gfs2_inode *ip); int gfs2_dinode_dealloc(struct gfs2_inode *inode); int gfs2_change_nlink(struct gfs2_inode *ip, int diff); -int gfs2_change_nlink_i(struct gfs2_inode *ip, int diff); +int gfs2_change_nlink_i(struct gfs2_inode *ip); struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name, int is_root, struct nameidata *nd); struct inode *gfs2_createi(struct gfs2_holder *ghs, const struct qstr *name, |