Unionfs: display mount point name along with generation number

CC: Dave Miller <justdave@mozilla.com>
Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
index 04a453f734df0fe9162fd400c548db275746efb0..0b402aa01c3f41c981beb97a6e0841356d6ab68b 100644 (file)
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -849,7 +849,12 @@ static int unionfs_get_sb(struct file_system_type *fs_type,
                          int flags, const char *dev_name,
                          void *raw_data, struct vfsmount *mnt)
 {
-       return get_sb_nodev(fs_type, flags, raw_data, unionfs_read_super, mnt);
+       int err;
+       err = get_sb_nodev(fs_type, flags, raw_data, unionfs_read_super, mnt);
+       if (!err)
+               UNIONFS_SB(mnt->mnt_sb)->dev_name =
+                       kstrdup(dev_name, GFP_KERNEL);
+       return err;
 }
 
 static struct file_system_type unionfs_fs_type = {

diff --git a/fs/unionfs/super.c b/fs/unionfs/super.c
index 87beae52c87596d89cd6ee02fdd6d54068a987d6..54c25f9a668ab656fdbffbf5469bc0210a0bc9c4 100644 (file)
--- a/fs/unionfs/super.c
+++ b/fs/unionfs/super.c
@@ -124,6 +124,7 @@ static void unionfs_put_super(struct super_block *sb)
                atomic_dec(&s->s_active);
        }
 
+       kfree(spd->dev_name);
        kfree(spd->data);
        kfree(spd);
        sb->s_fs_info = NULL;
@@ -823,7 +824,8 @@ out_no_change:
        atomic_set(&UNIONFS_D(sb->s_root)->generation, i);
        atomic_set(&UNIONFS_I(sb->s_root->d_inode)->generation, i);
        if (!(*flags & MS_SILENT))
-               pr_info("unionfs: new generation number %d\n", i);
+               pr_info("unionfs: %s: new generation number %d\n",
+                       UNIONFS_SB(sb)->dev_name, i);
        /* finally, update the root dentry's times */
        unionfs_copy_attr_times(sb->s_root->d_inode);
        err = 0;                /* reset to success */

diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index a3017ec309e0baf7ae2cad9f8d1cd387611b93c3..20c0c1e27774e1c5e9d5167d915703e1d62962e6 100644 (file)
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -201,6 +201,7 @@ struct unionfs_sb_info {
        struct unionfs_rw_semaphore rwsem;
        pid_t write_lock_owner; /* PID of rw_sem owner (write lock) */
        int high_branch_id;     /* last unique branch ID given */
+       char *dev_name;         /* to identify different unions in pr_debug */
        struct odf_sb_info odf;
        struct unionfs_data *data;
 };