Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 201752
b: refs/heads/master
c: d2e078c
h: refs/heads/master
v: v3
  • Loading branch information
Christoph Hellwig authored and Alex Elder committed Jul 26, 2010
1 parent 2b40f51 commit 5db9af3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 807cbbdb438d172b87b380eebc1f1c1a5a3549b2
refs/heads/master: d2e078c33c24f97411b0fdd7cd2173e68125e7e3
5 changes: 3 additions & 2 deletions trunk/fs/xfs/linux-2.6/xfs_trace.h
Original file line number Diff line number Diff line change
Expand Up @@ -561,8 +561,9 @@ DEFINE_EVENT(xfs_iget_class, name, \
TP_ARGS(ip))
DEFINE_IGET_EVENT(xfs_iget_skip);
DEFINE_IGET_EVENT(xfs_iget_reclaim);
DEFINE_IGET_EVENT(xfs_iget_found);
DEFINE_IGET_EVENT(xfs_iget_alloc);
DEFINE_IGET_EVENT(xfs_iget_reclaim_fail);
DEFINE_IGET_EVENT(xfs_iget_hit);
DEFINE_IGET_EVENT(xfs_iget_miss);

DECLARE_EVENT_CLASS(xfs_inode_class,
TP_PROTO(struct xfs_inode *ip, unsigned long caller_ip),
Expand Down
8 changes: 4 additions & 4 deletions trunk/fs/xfs/xfs_iget.c
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ xfs_iget_cache_hit(
ip->i_flags &= ~XFS_INEW;
ip->i_flags |= XFS_IRECLAIMABLE;
__xfs_inode_set_reclaim_tag(pag, ip);
trace_xfs_iget_reclaim(ip);
trace_xfs_iget_reclaim_fail(ip);
goto out_error;
}

Expand All @@ -223,13 +223,15 @@ xfs_iget_cache_hit(
} else {
/* If the VFS inode is being torn down, pause and try again. */
if (!igrab(inode)) {
trace_xfs_iget_skip(ip);
error = EAGAIN;
goto out_error;
}

/* We've got a live one. */
spin_unlock(&ip->i_flags_lock);
read_unlock(&pag->pag_ici_lock);
trace_xfs_iget_hit(ip);
}

if (lock_flags != 0)
Expand All @@ -238,7 +240,6 @@ xfs_iget_cache_hit(
xfs_iflags_clear(ip, XFS_ISTALE);
XFS_STATS_INC(xs_ig_found);

trace_xfs_iget_found(ip);
return 0;

out_error:
Expand Down Expand Up @@ -271,7 +272,7 @@ xfs_iget_cache_miss(
if (error)
goto out_destroy;

xfs_itrace_entry(ip);
trace_xfs_iget_miss(ip);

if ((ip->i_d.di_mode == 0) && !(flags & XFS_IGET_CREATE)) {
error = ENOENT;
Expand Down Expand Up @@ -317,7 +318,6 @@ xfs_iget_cache_miss(
write_unlock(&pag->pag_ici_lock);
radix_tree_preload_end();

trace_xfs_iget_alloc(ip);
*ipp = ip;
return 0;

Expand Down

0 comments on commit 5db9af3

Please sign in to comment.