Unionfs: grab lower super_block references

This prevents the lower super_block from being destroyed too early, when a
lower file system is being unmounted with MNT_FORCE or MNT_DETACH.

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
index bd9c2a1a4abbdf80b0bd3d4f311e3c7231ec3127..4059d006983ffbaedbc6603614d1bfc13a07b5fb 100644 (file)
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -636,6 +636,7 @@ static int unionfs_read_super(struct super_block *sb, void *raw_data,
        sbend(sb) = bend = lower_root_info->bend;
        for (bindex = bstart; bindex <= bend; bindex++) {
                struct dentry *d = lower_root_info->lower_paths[bindex].dentry;
+               atomic_inc(&d->d_sb->s_active);
                unionfs_set_lower_super_idx(sb, bindex, d->d_sb);
        }
 
@@ -713,6 +714,8 @@ out_dput:
                        dput(d);
                        /* initializing: can't use unionfs_mntput here */
                        mntput(m);
+                       /* drop refs we took earlier */
+                       atomic_dec(&d->d_sb->s_active);
                }
                kfree(lower_root_info->lower_paths);
                kfree(lower_root_info);

diff --git a/fs/unionfs/super.c b/fs/unionfs/super.c
index 873a8adc12916278242c330cf7ccd90d73d44a4b..18f5980490563f5f5d18492b6fce16d2d11564c0 100644 (file)
--- a/fs/unionfs/super.c
+++ b/fs/unionfs/super.c
@@ -116,6 +116,14 @@ static void unionfs_put_super(struct super_block *sb)
                }
        BUG_ON(leaks != 0);
 
+       /* decrement lower super references */
+       for (bindex = bstart; bindex <= bend; bindex++) {
+               struct super_block *s;
+               s = unionfs_lower_super_idx(sb, bindex);
+               unionfs_set_lower_super_idx(sb, bindex, NULL);
+               atomic_dec(&s->s_active);
+       }
+
        kfree(spd->data);
        kfree(spd);
        sb->s_fs_info = NULL;
@@ -729,6 +737,12 @@ out_no_change:
         */
        /* purge_sb_data(sb); */
 
+       /* grab new lower super references; release old ones */
+       for (i = 0; i < new_branches; i++)
+               atomic_inc(&new_data[i].sb->s_active);
+       for (i = 0; i < new_branches; i++)
+               atomic_dec(&UNIONFS_SB(sb)->data[i].sb->s_active);
+
        /* copy new vectors into their correct place */
        tmp_data = UNIONFS_SB(sb)->data;
        UNIONFS_SB(sb)->data = new_data;

diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index 1686e810603d01ebe673e8515e3f27f15bfdcb10..8ba7d4f985d00335aa6adf29757752eafa18504e 100644 (file)
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -134,7 +134,7 @@ struct unionfs_dentry_info {
 
 /* These are the pointers to our various objects. */
 struct unionfs_data {
-       struct super_block *sb;
+       struct super_block *sb; /* lower super_block */
        atomic_t open_files;    /* number of open files on branch */
        int branchperms;
        int branch_id;          /* unique branch ID at re/mount time */