Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 254077
b: refs/heads/master
c: 2f7e33d
h: refs/heads/master
i:
  254075: 5107a6a
v: v3
  • Loading branch information
Miao Xie authored and Chris Mason committed Jun 27, 2011
1 parent c49fc0c commit 8c65604
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 27 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9b90f5135320bc74dc6c9a8c74d69fd4821d9282
refs/heads/master: 2f7e33d432d097a2a7f467b031bf18be91cb3d49
104 changes: 80 additions & 24 deletions trunk/fs/btrfs/delayed-inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,28 +82,27 @@ static inline struct btrfs_delayed_root *btrfs_get_delayed_root(
return root->fs_info->delayed_root;
}

static struct btrfs_delayed_node *btrfs_get_or_create_delayed_node(
struct inode *inode)
static struct btrfs_delayed_node *btrfs_get_delayed_node(struct inode *inode)
{
struct btrfs_delayed_node *node;
struct btrfs_inode *btrfs_inode = BTRFS_I(inode);
struct btrfs_root *root = btrfs_inode->root;
u64 ino = btrfs_ino(inode);
int ret;
struct btrfs_delayed_node *node;

again:
node = ACCESS_ONCE(btrfs_inode->delayed_node);
if (node) {
atomic_inc(&node->refs); /* can be accessed */
atomic_inc(&node->refs);
return node;
}

spin_lock(&root->inode_lock);
node = radix_tree_lookup(&root->delayed_nodes_tree, ino);
if (node) {
if (btrfs_inode->delayed_node) {
atomic_inc(&node->refs); /* can be accessed */
BUG_ON(btrfs_inode->delayed_node != node);
spin_unlock(&root->inode_lock);
goto again;
return node;
}
btrfs_inode->delayed_node = node;
atomic_inc(&node->refs); /* can be accessed */
Expand All @@ -113,6 +112,23 @@ static struct btrfs_delayed_node *btrfs_get_or_create_delayed_node(
}
spin_unlock(&root->inode_lock);

return NULL;
}

static struct btrfs_delayed_node *btrfs_get_or_create_delayed_node(
struct inode *inode)
{
struct btrfs_delayed_node *node;
struct btrfs_inode *btrfs_inode = BTRFS_I(inode);
struct btrfs_root *root = btrfs_inode->root;
u64 ino = btrfs_ino(inode);
int ret;

again:
node = btrfs_get_delayed_node(inode);
if (node)
return node;

node = kmem_cache_alloc(delayed_node_cache, GFP_NOFS);
if (!node)
return ERR_PTR(-ENOMEM);
Expand Down Expand Up @@ -548,19 +564,6 @@ struct btrfs_delayed_item *__btrfs_next_delayed_item(
return next;
}

static inline struct btrfs_delayed_node *btrfs_get_delayed_node(
struct inode *inode)
{
struct btrfs_inode *btrfs_inode = BTRFS_I(inode);
struct btrfs_delayed_node *delayed_node;

delayed_node = btrfs_inode->delayed_node;
if (delayed_node)
atomic_inc(&delayed_node->refs);

return delayed_node;
}

static inline struct btrfs_root *btrfs_get_fs_root(struct btrfs_root *root,
u64 root_id)
{
Expand Down Expand Up @@ -1404,8 +1407,7 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans,

int btrfs_inode_delayed_dir_index_count(struct inode *inode)
{
struct btrfs_delayed_node *delayed_node = BTRFS_I(inode)->delayed_node;
int ret = 0;
struct btrfs_delayed_node *delayed_node = btrfs_get_delayed_node(inode);

if (!delayed_node)
return -ENOENT;
Expand All @@ -1415,11 +1417,14 @@ int btrfs_inode_delayed_dir_index_count(struct inode *inode)
* a new directory index is added into the delayed node and index_cnt
* is updated now. So we needn't lock the delayed node.
*/
if (!delayed_node->index_cnt)
if (!delayed_node->index_cnt) {
btrfs_release_delayed_node(delayed_node);
return -EINVAL;
}

BTRFS_I(inode)->index_cnt = delayed_node->index_cnt;
return ret;
btrfs_release_delayed_node(delayed_node);
return 0;
}

void btrfs_get_delayed_items(struct inode *inode, struct list_head *ins_list,
Expand Down Expand Up @@ -1613,6 +1618,57 @@ static void fill_stack_inode_item(struct btrfs_trans_handle *trans,
inode->i_ctime.tv_nsec);
}

int btrfs_fill_inode(struct inode *inode, u32 *rdev)
{
struct btrfs_delayed_node *delayed_node;
struct btrfs_inode_item *inode_item;
struct btrfs_timespec *tspec;

delayed_node = btrfs_get_delayed_node(inode);
if (!delayed_node)
return -ENOENT;

mutex_lock(&delayed_node->mutex);
if (!delayed_node->inode_dirty) {
mutex_unlock(&delayed_node->mutex);
btrfs_release_delayed_node(delayed_node);
return -ENOENT;
}

inode_item = &delayed_node->inode_item;

inode->i_uid = btrfs_stack_inode_uid(inode_item);
inode->i_gid = btrfs_stack_inode_gid(inode_item);
btrfs_i_size_write(inode, btrfs_stack_inode_size(inode_item));
inode->i_mode = btrfs_stack_inode_mode(inode_item);
inode->i_nlink = btrfs_stack_inode_nlink(inode_item);
inode_set_bytes(inode, btrfs_stack_inode_nbytes(inode_item));
BTRFS_I(inode)->generation = btrfs_stack_inode_generation(inode_item);
BTRFS_I(inode)->sequence = btrfs_stack_inode_sequence(inode_item);
inode->i_rdev = 0;
*rdev = btrfs_stack_inode_rdev(inode_item);
BTRFS_I(inode)->flags = btrfs_stack_inode_flags(inode_item);

tspec = btrfs_inode_atime(inode_item);
inode->i_atime.tv_sec = btrfs_stack_timespec_sec(tspec);
inode->i_atime.tv_nsec = btrfs_stack_timespec_nsec(tspec);

tspec = btrfs_inode_mtime(inode_item);
inode->i_mtime.tv_sec = btrfs_stack_timespec_sec(tspec);
inode->i_mtime.tv_nsec = btrfs_stack_timespec_nsec(tspec);

tspec = btrfs_inode_ctime(inode_item);
inode->i_ctime.tv_sec = btrfs_stack_timespec_sec(tspec);
inode->i_ctime.tv_nsec = btrfs_stack_timespec_nsec(tspec);

inode->i_generation = BTRFS_I(inode)->generation;
BTRFS_I(inode)->index_cnt = (u64)-1;

mutex_unlock(&delayed_node->mutex);
btrfs_release_delayed_node(delayed_node);
return 0;
}

int btrfs_delayed_update_inode(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct inode *inode)
{
Expand Down
1 change: 1 addition & 0 deletions trunk/fs/btrfs/delayed-inode.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ void btrfs_kill_delayed_inode_items(struct inode *inode);

int btrfs_delayed_update_inode(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct inode *inode);
int btrfs_fill_inode(struct inode *inode, u32 *rdev);

/* Used for drop dead root */
void btrfs_kill_all_delayed_nodes(struct btrfs_root *root);
Expand Down
12 changes: 10 additions & 2 deletions trunk/fs/btrfs/inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2509,6 +2509,11 @@ static void btrfs_read_locked_inode(struct inode *inode)
int maybe_acls;
u32 rdev;
int ret;
bool filled = false;

ret = btrfs_fill_inode(inode, &rdev);
if (!ret)
filled = true;

path = btrfs_alloc_path();
BUG_ON(!path);
Expand All @@ -2520,6 +2525,10 @@ static void btrfs_read_locked_inode(struct inode *inode)
goto make_bad;

leaf = path->nodes[0];

if (filled)
goto cache_acl;

inode_item = btrfs_item_ptr(leaf, path->slots[0],
struct btrfs_inode_item);
if (!leaf->map_token)
Expand Down Expand Up @@ -2556,7 +2565,7 @@ static void btrfs_read_locked_inode(struct inode *inode)

BTRFS_I(inode)->index_cnt = (u64)-1;
BTRFS_I(inode)->flags = btrfs_inode_flags(leaf, inode_item);

cache_acl:
/*
* try to precache a NULL acl entry for files that don't have
* any xattrs or acls
Expand All @@ -2572,7 +2581,6 @@ static void btrfs_read_locked_inode(struct inode *inode)
}

btrfs_free_path(path);
inode_item = NULL;

switch (inode->i_mode & S_IFMT) {
case S_IFREG:
Expand Down

0 comments on commit 8c65604

Please sign in to comment.