diff options
author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /fs/xfs/xfs_itable.c | |
parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/xfs/xfs_itable.c')
-rw-r--r-- | fs/xfs/xfs_itable.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c index eb85bdedad0c..419de15aeb43 100644 --- a/fs/xfs/xfs_itable.c +++ b/fs/xfs/xfs_itable.c | |||
@@ -71,11 +71,6 @@ xfs_bulkstat_one_iget( | |||
71 | 71 | ||
72 | ASSERT(ip != NULL); | 72 | ASSERT(ip != NULL); |
73 | ASSERT(ip->i_blkno != (xfs_daddr_t)0); | 73 | ASSERT(ip->i_blkno != (xfs_daddr_t)0); |
74 | if (ip->i_d.di_mode == 0) { | ||
75 | *stat = BULKSTAT_RV_NOTHING; | ||
76 | error = XFS_ERROR(ENOENT); | ||
77 | goto out_iput; | ||
78 | } | ||
79 | 74 | ||
80 | vp = XFS_ITOV(ip); | 75 | vp = XFS_ITOV(ip); |
81 | dic = &ip->i_d; | 76 | dic = &ip->i_d; |
@@ -124,7 +119,6 @@ xfs_bulkstat_one_iget( | |||
124 | break; | 119 | break; |
125 | } | 120 | } |
126 | 121 | ||
127 | out_iput: | ||
128 | xfs_iput(ip, XFS_ILOCK_SHARED); | 122 | xfs_iput(ip, XFS_ILOCK_SHARED); |
129 | return error; | 123 | return error; |
130 | } | 124 | } |