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

[~andy/linux] / kernel / acct.c

diff --git a/kernel/acct.c b/kernel/acct.c
index e8b1627ab9c7cf21892acb45722293815ada0ede..b9bd7f098ee5d17fc8fa41bb823b80e0b94df3d6 100644 (file)
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -205,7 +205,7 @@ static int acct_on(struct filename *pathname)
        if (IS_ERR(file))
                return PTR_ERR(file);
 
-       if (!S_ISREG(file->f_path.dentry->d_inode->i_mode)) {
+       if (!S_ISREG(file_inode(file)->i_mode)) {
                filp_close(file, NULL);
                return -EACCES;
        }