Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[linux.git] / fs / libfs.c

diff --git a/fs/libfs.c b/fs/libfs.c
index 18d08f5db53adb46d832222357df9d81d5058f11..f86ec27a4230a6cd23f6d020c53217cd30a060f1 100644 (file)
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -68,7 +68,7 @@ struct dentry *simple_lookup(struct inode *dir, struct dentry *dentry, struct na
 
 int dcache_dir_open(struct inode *inode, struct file *file)
 {
-       static struct qstr cursor_name = {.len = 1, .name = "."};
+       static struct qstr cursor_name = QSTR_INIT(".", 1);
 
        file->private_data = d_alloc(file->f_path.dentry, &cursor_name);
 
@@ -225,7 +225,7 @@ struct dentry *mount_pseudo(struct file_system_type *fs_type, char *name,
        struct super_block *s = sget(fs_type, NULL, set_anon_super, NULL);
        struct dentry *dentry;
        struct inode *root;
-       struct qstr d_name = {.name = name, .len = strlen(name)};
+       struct qstr d_name = QSTR_INIT(name, strlen(name));
 
        if (IS_ERR(s))
                return ERR_CAST(s);