Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus

[karo-tx-linux.git] / fs / qnx6 / inode.c

diff --git a/fs/qnx6/inode.c b/fs/qnx6/inode.c
index 44e73923670d59a0c7663804d8710fb3262c6106..32d2e1a9774ca66005d92786df99a70865efb3fa 100644 (file)
--- a/fs/qnx6/inode.c
+++ b/fs/qnx6/inode.c
@@ -182,7 +182,7 @@ static const char *qnx6_checkroot(struct super_block *s)
        static char match_root[2][3] = {".\0\0", "..\0"};
        int i, error = 0;
        struct qnx6_dir_entry *dir_entry;
-       struct inode *root = s->s_root->d_inode;
+       struct inode *root = d_inode(s->s_root);
        struct address_space *mapping = root->i_mapping;
        struct page *page = read_mapping_page(mapping, 0, NULL);
        if (IS_ERR(page))