gfs2: Keep track of deleted inode generations in LVBs

When deleting an inode, keep track of the generation of the deleted inode in
the inode glock Lock Value Block (LVB).  When trying to delete an inode
remotely, check the last-known inode generation against the deleted inode
generation to skip duplicate remote deletes.  This avoids taking the resource
group glock in order to verify the block type.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 86e9e62..1268161 100644 (file)
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -755,6 +755,25 @@ out_unlock:
        return;
 }
 
+void gfs2_inode_remember_delete(struct gfs2_glock *gl, u64 generation)
+{
+       struct gfs2_inode_lvb *ri = (void *)gl->gl_lksb.sb_lvbptr;
+
+       if (ri->ri_magic == 0)
+               ri->ri_magic = cpu_to_be32(GFS2_MAGIC);
+       if (ri->ri_magic == cpu_to_be32(GFS2_MAGIC))
+               ri->ri_generation_deleted = cpu_to_be64(generation);
+}
+
+bool gfs2_inode_already_deleted(struct gfs2_glock *gl, u64 generation)
+{
+       struct gfs2_inode_lvb *ri = (void *)gl->gl_lksb.sb_lvbptr;
+
+       if (ri->ri_magic != cpu_to_be32(GFS2_MAGIC))
+               return false;
+       return generation <= be64_to_cpu(ri->ri_generation_deleted);
+}
+
 static void delete_work_func(struct work_struct *work)
 {
        struct gfs2_glock *gl = container_of(work, struct gfs2_glock, gl_delete);

diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h
index b8adaf8..5c1b60f 100644 (file)
--- a/fs/gfs2/glock.h
+++ b/fs/gfs2/glock.h
@@ -306,4 +306,7 @@ static inline void glock_clear_object(struct gfs2_glock *gl, void *object)
        spin_unlock(&gl->gl_lockref.lock);
 }
 
+extern void gfs2_inode_remember_delete(struct gfs2_glock *gl, u64 generation);
+extern bool gfs2_inode_already_deleted(struct gfs2_glock *gl, u64 generation);
+
 #endif /* __GLOCK_DOT_H__ */

diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index 9e9c7a4..63ae9e4 100644 (file)
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -692,7 +692,7 @@ const struct gfs2_glock_operations gfs2_inode_glops = {
        .go_lock = inode_go_lock,
        .go_dump = inode_go_dump,
        .go_type = LM_TYPE_INODE,
-       .go_flags = GLOF_ASPACE | GLOF_LRU,
+       .go_flags = GLOF_ASPACE | GLOF_LRU | GLOF_LVB,
        .go_free = inode_go_free,
 };
 

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 956fced..e69efed 100644 (file)
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -1315,6 +1315,8 @@ static void gfs2_evict_inode(struct inode *inode)
                goto out;
        }
 
+       if (gfs2_inode_already_deleted(ip->i_gl, ip->i_no_formal_ino))
+               goto out_truncate;
        error = gfs2_check_blk_type(sdp, ip->i_no_addr, GFS2_BLKST_UNLINKED);
        if (error)
                goto out_truncate;
@@ -1368,6 +1370,7 @@ alloc_failed:
           that subsequent inode creates don't see an old gl_object. */
        glock_clear_object(ip->i_gl, ip);
        error = gfs2_dinode_dealloc(ip);
+       gfs2_inode_remember_delete(ip->i_gl, ip->i_no_formal_ino);
        goto out_unlock;
 
 out_truncate:

diff --git a/include/uapi/linux/gfs2_ondisk.h b/include/uapi/linux/gfs2_ondisk.h
index 2dc10a0..07e508e 100644 (file)
--- a/include/uapi/linux/gfs2_ondisk.h
+++ b/include/uapi/linux/gfs2_ondisk.h
@@ -171,6 +171,12 @@ struct gfs2_rindex {
 #define GFS2_RGF_NOALLOC       0x00000008
 #define GFS2_RGF_TRIMMED       0x00000010
 
+struct gfs2_inode_lvb {
+       __be32 ri_magic;
+       __be32 __pad;
+       __be64 ri_generation_deleted;
+};
+
 struct gfs2_rgrp_lvb {
        __be32 rl_magic;
        __be32 rl_flags;