Unionfs: use UNIONFS_NAME macro

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

diff --git a/fs/unionfs/debug.c b/fs/unionfs/debug.c
index b103eb959f9687875ae3af3f908b4c1827865477..da82a479b2977f35c62e1765824dd9f73628249a 100644 (file)
--- a/fs/unionfs/debug.c
+++ b/fs/unionfs/debug.c
@@ -428,7 +428,7 @@ void __unionfs_check_nd(const struct nameidata *nd,
                file = nd->intent.open.file;
                if (unlikely(file->f_path.dentry &&
                             strcmp(file->f_dentry->d_sb->s_type->name,
-                                   "unionfs"))) {
+                                   UNIONFS_NAME))) {
                        PRINT_CALLER(fname, fxn, line);
                        printk(" CND1: lower_file of type %s\n",
                               file->f_path.dentry->d_sb->s_type->name);

diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
index 72438fb8c5cc2b46e2f3ffc5bc4fbe73ad4d5cf4..615617a07ee7ba62d6cdbecd4e1d4c3d72729929 100644 (file)
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -227,7 +227,7 @@ void unionfs_reinterpose(struct dentry *dentry)
 int check_branch(struct nameidata *nd)
 {
        /* XXX: remove in ODF code -- stacking unions allowed there */
-       if (!strcmp(nd->dentry->d_sb->s_type->name, "unionfs"))
+       if (!strcmp(nd->dentry->d_sb->s_type->name, UNIONFS_NAME))
                return -EINVAL;
        if (!nd->dentry->d_inode)
                return -ENOENT;
@@ -722,7 +722,7 @@ static int unionfs_get_sb(struct file_system_type *fs_type,
 
 static struct file_system_type unionfs_fs_type = {
        .owner          = THIS_MODULE,
-       .name           = "unionfs",
+       .name           = UNIONFS_NAME,
        .get_sb         = unionfs_get_sb,
        .kill_sb        = generic_shutdown_super,
        .fs_flags       = FS_REVAL_DOT,