{net, ib}/mlx5: Make cache line size determination at runtime.

[cascardo/linux.git] / fs / cachefiles / namei.c

diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
index 6eb3dec..41df8a2 100644 (file)
--- a/fs/cachefiles/namei.c
+++ b/fs/cachefiles/namei.c
@@ -262,10 +262,9 @@ requeue:
  * Mark an object as being inactive.
  */
 void cachefiles_mark_object_inactive(struct cachefiles_cache *cache,
-                                    struct cachefiles_object *object)
+                                    struct cachefiles_object *object,
+                                    blkcnt_t i_blocks)
 {
-       blkcnt_t i_blocks = d_backing_inode(object->dentry)->i_blocks;
-
        write_lock(&cache->active_lock);
        rb_erase(&object->active_node, &cache->active_nodes);
        clear_bit(CACHEFILES_OBJECT_ACTIVE, &object->flags);
@@ -708,7 +707,8 @@ mark_active_timed_out:
 
 check_error:
        _debug("check error %d", ret);
-       cachefiles_mark_object_inactive(cache, object);
+       cachefiles_mark_object_inactive(
+               cache, object, d_backing_inode(object->dentry)->i_blocks);
 release_dentry:
        dput(object->dentry);
        object->dentry = NULL;
@@ -804,8 +804,7 @@ struct dentry *cachefiles_get_directory(struct cachefiles_cache *cache,
            !d_backing_inode(subdir)->i_op->lookup ||
            !d_backing_inode(subdir)->i_op->mkdir ||
            !d_backing_inode(subdir)->i_op->create ||
-           (!d_backing_inode(subdir)->i_op->rename &&
-            !d_backing_inode(subdir)->i_op->rename2) ||
+           !d_backing_inode(subdir)->i_op->rename ||
            !d_backing_inode(subdir)->i_op->rmdir ||
            !d_backing_inode(subdir)->i_op->unlink)
                goto check_error;