diff options
Diffstat (limited to 'fs/xfs/xfs_vnodeops.c')
-rw-r--r-- | fs/xfs/xfs_vnodeops.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index 578f3f59b789..6558ffd8d140 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c | |||
@@ -53,6 +53,7 @@ | |||
53 | #include "xfs_log_priv.h" | 53 | #include "xfs_log_priv.h" |
54 | #include "xfs_filestream.h" | 54 | #include "xfs_filestream.h" |
55 | #include "xfs_vnodeops.h" | 55 | #include "xfs_vnodeops.h" |
56 | #include "xfs_trace.h" | ||
56 | 57 | ||
57 | int | 58 | int |
58 | xfs_setattr( | 59 | xfs_setattr( |
@@ -1397,7 +1398,6 @@ xfs_lookup( | |||
1397 | if (error) | 1398 | if (error) |
1398 | goto out_free_name; | 1399 | goto out_free_name; |
1399 | 1400 | ||
1400 | xfs_itrace_ref(*ipp); | ||
1401 | return 0; | 1401 | return 0; |
1402 | 1402 | ||
1403 | out_free_name: | 1403 | out_free_name: |
@@ -1543,7 +1543,6 @@ xfs_create( | |||
1543 | * At this point, we've gotten a newly allocated inode. | 1543 | * At this point, we've gotten a newly allocated inode. |
1544 | * It is locked (and joined to the transaction). | 1544 | * It is locked (and joined to the transaction). |
1545 | */ | 1545 | */ |
1546 | xfs_itrace_ref(ip); | ||
1547 | ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); | 1546 | ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); |
1548 | 1547 | ||
1549 | /* | 1548 | /* |
@@ -2003,9 +2002,6 @@ xfs_remove( | |||
2003 | if (!is_dir && link_zero && xfs_inode_is_filestream(ip)) | 2002 | if (!is_dir && link_zero && xfs_inode_is_filestream(ip)) |
2004 | xfs_filestream_deassociate(ip); | 2003 | xfs_filestream_deassociate(ip); |
2005 | 2004 | ||
2006 | xfs_itrace_exit(ip); | ||
2007 | xfs_itrace_exit(dp); | ||
2008 | |||
2009 | std_return: | 2005 | std_return: |
2010 | if (DM_EVENT_ENABLED(dp, DM_EVENT_POSTREMOVE)) { | 2006 | if (DM_EVENT_ENABLED(dp, DM_EVENT_POSTREMOVE)) { |
2011 | XFS_SEND_NAMESP(mp, DM_EVENT_POSTREMOVE, dp, DM_RIGHT_NULL, | 2007 | XFS_SEND_NAMESP(mp, DM_EVENT_POSTREMOVE, dp, DM_RIGHT_NULL, |
@@ -2302,7 +2298,6 @@ xfs_symlink( | |||
2302 | goto error_return; | 2298 | goto error_return; |
2303 | goto error1; | 2299 | goto error1; |
2304 | } | 2300 | } |
2305 | xfs_itrace_ref(ip); | ||
2306 | 2301 | ||
2307 | /* | 2302 | /* |
2308 | * An error after we've joined dp to the transaction will result in the | 2303 | * An error after we've joined dp to the transaction will result in the |
@@ -2845,7 +2840,6 @@ xfs_free_file_space( | |||
2845 | ioffset = offset & ~(rounding - 1); | 2840 | ioffset = offset & ~(rounding - 1); |
2846 | 2841 | ||
2847 | if (VN_CACHED(VFS_I(ip)) != 0) { | 2842 | if (VN_CACHED(VFS_I(ip)) != 0) { |
2848 | xfs_inval_cached_trace(ip, ioffset, -1, ioffset, -1); | ||
2849 | error = xfs_flushinval_pages(ip, ioffset, -1, FI_REMAPF_LOCKED); | 2843 | error = xfs_flushinval_pages(ip, ioffset, -1, FI_REMAPF_LOCKED); |
2850 | if (error) | 2844 | if (error) |
2851 | goto out_unlock_iolock; | 2845 | goto out_unlock_iolock; |