diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2008-08-26 04:38:26 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2008-08-27 08:33:10 -0400 |
commit | 0188d6c5807b65e2e20dcb75a668efbe5418b27e (patch) | |
tree | 419ee0e74cded399d2e4b9adf4dacf9f9dd31a3e /fs/gfs2/inode.h | |
parent | 72dbf4790fc6736f9cb54424245114acf0b0038c (diff) |
GFS2: Fix & clean up GFS2 rename
This patch fixes a locking issue in the rename code by ensuring that we hold
the per sb rename lock over both directory and "other" renames which involve
different parent directories.
At the same time, this moved the (only called from one place) function
gfs2_ok_to_move into the file that its called from, so we can mark it
static. This should make a code a bit easier to follow.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Cc: Peter Staubach <staubach@redhat.com>
Diffstat (limited to 'fs/gfs2/inode.h')
-rw-r--r-- | fs/gfs2/inode.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/gfs2/inode.h b/fs/gfs2/inode.h index 58f9607d6a86..bfd2afc0c906 100644 --- a/fs/gfs2/inode.h +++ b/fs/gfs2/inode.h | |||
@@ -91,7 +91,6 @@ int gfs2_rmdiri(struct gfs2_inode *dip, const struct qstr *name, | |||
91 | int gfs2_unlink_ok(struct gfs2_inode *dip, const struct qstr *name, | 91 | int gfs2_unlink_ok(struct gfs2_inode *dip, const struct qstr *name, |
92 | const struct gfs2_inode *ip); | 92 | const struct gfs2_inode *ip); |
93 | int gfs2_permission(struct inode *inode, int mask); | 93 | int gfs2_permission(struct inode *inode, int mask); |
94 | int gfs2_ok_to_move(struct gfs2_inode *this, struct gfs2_inode *to); | ||
95 | int gfs2_readlinki(struct gfs2_inode *ip, char **buf, unsigned int *len); | 94 | int gfs2_readlinki(struct gfs2_inode *ip, char **buf, unsigned int *len); |
96 | int gfs2_glock_nq_atime(struct gfs2_holder *gh); | 95 | int gfs2_glock_nq_atime(struct gfs2_holder *gh); |
97 | int gfs2_setattr_simple(struct gfs2_inode *ip, struct iattr *attr); | 96 | int gfs2_setattr_simple(struct gfs2_inode *ip, struct iattr *attr); |