diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2010-06-07 13:43:19 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-08-09 16:48:35 -0400 |
commit | 45321ac54316eaeeebde0b5f728a1791e500974c (patch) | |
tree | c3989dd1a8b4a50168d696aa608941de88da9ade /fs/gfs2/super.c | |
parent | 30140837f256558c943636245ab90897a9455a70 (diff) |
Make ->drop_inode() just return whether inode needs to be dropped
... and let iput_final() do the actual eviction or retention
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/gfs2/super.c')
-rw-r--r-- | fs/gfs2/super.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 555f5a417c67..fa865ab37f12 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c | |||
@@ -1191,7 +1191,7 @@ static int gfs2_remount_fs(struct super_block *sb, int *flags, char *data) | |||
1191 | * node for later deallocation. | 1191 | * node for later deallocation. |
1192 | */ | 1192 | */ |
1193 | 1193 | ||
1194 | static void gfs2_drop_inode(struct inode *inode) | 1194 | static int gfs2_drop_inode(struct inode *inode) |
1195 | { | 1195 | { |
1196 | struct gfs2_inode *ip = GFS2_I(inode); | 1196 | struct gfs2_inode *ip = GFS2_I(inode); |
1197 | 1197 | ||
@@ -1200,7 +1200,7 @@ static void gfs2_drop_inode(struct inode *inode) | |||
1200 | if (gl && test_bit(GLF_DEMOTE, &gl->gl_flags)) | 1200 | if (gl && test_bit(GLF_DEMOTE, &gl->gl_flags)) |
1201 | clear_nlink(inode); | 1201 | clear_nlink(inode); |
1202 | } | 1202 | } |
1203 | generic_drop_inode(inode); | 1203 | return generic_drop_inode(inode); |
1204 | } | 1204 | } |
1205 | 1205 | ||
1206 | static int is_ancestor(const struct dentry *d1, const struct dentry *d2) | 1206 | static int is_ancestor(const struct dentry *d1, const struct dentry *d2) |