Merge tag 'drm-intel-next-2015-02-27' of git://anongit.freedesktop.org/drm-intel...

[linux-2.6-block.git] / fs / cachefiles / interface.c

diff --git a/fs/cachefiles/interface.c b/fs/cachefiles/interface.c
index 1c7293c3a93ae935c5be8cdfc149fcd3f84e0dad..232426214fdd1849b21a4e3c080563e2132e8bd2 100644 (file)
--- a/fs/cachefiles/interface.c
+++ b/fs/cachefiles/interface.c
@@ -437,7 +437,7 @@ static int cachefiles_attr_changed(struct fscache_object *_object)
        if (!object->backer)
                return -ENOBUFS;
 
-       ASSERT(S_ISREG(object->backer->d_inode->i_mode));
+       ASSERT(d_is_reg(object->backer));
 
        fscache_set_store_limit(&object->fscache, ni_size);
 
@@ -501,7 +501,7 @@ static void cachefiles_invalidate_object(struct fscache_operation *op)
               op->object->debug_id, (unsigned long long)ni_size);
 
        if (object->backer) {
-               ASSERT(S_ISREG(object->backer->d_inode->i_mode));
+               ASSERT(d_is_reg(object->backer));
 
                fscache_set_store_limit(&object->fscache, ni_size);