From 3dcdc95fe455472fc0af7ef1248c219cc80a842e Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Mon, 24 Mar 2008 17:29:42 -0400 Subject: [PATCH] Unionfs: display mount point name along with generation number CC: Dave Miller Signed-off-by: Erez Zadok --- fs/unionfs/main.c | 7 ++++++- fs/unionfs/super.c | 4 +++- fs/unionfs/union.h | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c index 8f59fb52354..b76264a5203 100644 --- a/fs/unionfs/main.c +++ b/fs/unionfs/main.c @@ -736,7 +736,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 2456654afca..e5cb2355938 100644 --- a/fs/unionfs/super.c +++ b/fs/unionfs/super.c @@ -134,6 +134,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; @@ -805,7 +806,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 ecf417d6fe9..735d40c4ff1 100644 --- a/fs/unionfs/union.h +++ b/fs/unionfs/union.h @@ -166,6 +166,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 unionfs_data *data; }; -- 2.34.1