Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 94995
b: refs/heads/master
c: 6a7f422
h: refs/heads/master
i:
  94993: ef6b9ee
  94991: d8c2759
v: v3
  • Loading branch information
Christoph Hellwig authored and Lachlan McIlroy committed Apr 29, 2008
1 parent 449a6f7 commit ec0267f
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 21 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: 4e5dbb3498e74514b9936d691413afc55fb84ea9
refs/heads/master: 6a7f422d47d4af461704ebb9d7a389d9e59766b2
2 changes: 1 addition & 1 deletion trunk/fs/xfs/linux-2.6/xfs_export.c
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ xfs_nfs_get_inode(
if (!ip)
return ERR_PTR(-EIO);

if (!ip->i_d.di_mode || ip->i_d.di_gen != generation) {
if (ip->i_d.di_gen != generation) {
xfs_iput_new(ip, XFS_ILOCK_SHARED);
return ERR_PTR(-ENOENT);
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/xfs/linux-2.6/xfs_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ xfs_vget_fsop_handlereq(
return error;
if (ip == NULL)
return XFS_ERROR(EIO);
if (ip->i_d.di_mode == 0 || ip->i_d.di_gen != igen) {
if (ip->i_d.di_gen != igen) {
xfs_iput_new(ip, XFS_ILOCK_SHARED);
return XFS_ERROR(ENOENT);
}
Expand Down
6 changes: 0 additions & 6 deletions trunk/fs/xfs/quota/xfs_qm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1737,12 +1737,6 @@ xfs_qm_dqusage_adjust(
return error;
}

if (ip->i_d.di_mode == 0) {
xfs_iput_new(ip, XFS_ILOCK_EXCL);
*res = BULKSTAT_RV_NOTHING;
return XFS_ERROR(ENOENT);
}

/*
* Obtain the locked dquots. In case of an error (eg. allocation
* fails for ENOSPC), we return the negative of the error number
Expand Down
6 changes: 0 additions & 6 deletions trunk/fs/xfs/quota/xfs_qm_syscalls.c
Original file line number Diff line number Diff line change
Expand Up @@ -1366,12 +1366,6 @@ xfs_qm_internalqcheck_adjust(
return (error);
}

if (ip->i_d.di_mode == 0) {
xfs_iput_new(ip, lock_flags);
*res = BULKSTAT_RV_NOTHING;
return XFS_ERROR(ENOENT);
}

/*
* This inode can have blocks after eof which can get released
* when we send it to inactive. Since we don't check the dquot
Expand Down
6 changes: 0 additions & 6 deletions trunk/fs/xfs/xfs_itable.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,6 @@ xfs_bulkstat_one_iget(

ASSERT(ip != NULL);
ASSERT(ip->i_blkno != (xfs_daddr_t)0);
if (ip->i_d.di_mode == 0) {
*stat = BULKSTAT_RV_NOTHING;
error = XFS_ERROR(ENOENT);
goto out_iput;
}

vp = XFS_ITOV(ip);
dic = &ip->i_d;
Expand Down Expand Up @@ -124,7 +119,6 @@ xfs_bulkstat_one_iget(
break;
}

out_iput:
xfs_iput(ip, XFS_ILOCK_SHARED);
return error;
}
Expand Down

0 comments on commit ec0267f

Please sign in to comment.