diff options
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_export.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_export.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/xfs/linux-2.6/xfs_export.c b/fs/xfs/linux-2.6/xfs_export.c index e7839ee49e4..3764d74790e 100644 --- a/fs/xfs/linux-2.6/xfs_export.c +++ b/fs/xfs/linux-2.6/xfs_export.c | |||
| @@ -23,13 +23,13 @@ | |||
| 23 | #include "xfs_sb.h" | 23 | #include "xfs_sb.h" |
| 24 | #include "xfs_ag.h" | 24 | #include "xfs_ag.h" |
| 25 | #include "xfs_dir2.h" | 25 | #include "xfs_dir2.h" |
| 26 | #include "xfs_dmapi.h" | ||
| 27 | #include "xfs_mount.h" | 26 | #include "xfs_mount.h" |
| 28 | #include "xfs_export.h" | 27 | #include "xfs_export.h" |
| 29 | #include "xfs_vnodeops.h" | 28 | #include "xfs_vnodeops.h" |
| 30 | #include "xfs_bmap_btree.h" | 29 | #include "xfs_bmap_btree.h" |
| 31 | #include "xfs_inode.h" | 30 | #include "xfs_inode.h" |
| 32 | #include "xfs_inode_item.h" | 31 | #include "xfs_inode_item.h" |
| 32 | #include "xfs_trace.h" | ||
| 33 | 33 | ||
| 34 | /* | 34 | /* |
| 35 | * Note that we only accept fileids which are long enough rather than allow | 35 | * Note that we only accept fileids which are long enough rather than allow |
| @@ -132,8 +132,7 @@ xfs_nfs_get_inode( | |||
| 132 | * fine and not an indication of a corrupted filesystem as clients can | 132 | * fine and not an indication of a corrupted filesystem as clients can |
| 133 | * send invalid file handles and we have to handle it gracefully.. | 133 | * send invalid file handles and we have to handle it gracefully.. |
| 134 | */ | 134 | */ |
| 135 | error = xfs_iget(mp, NULL, ino, XFS_IGET_UNTRUSTED, | 135 | error = xfs_iget(mp, NULL, ino, XFS_IGET_UNTRUSTED, 0, &ip); |
| 136 | XFS_ILOCK_SHARED, &ip); | ||
| 137 | if (error) { | 136 | if (error) { |
| 138 | /* | 137 | /* |
| 139 | * EINVAL means the inode cluster doesn't exist anymore. | 138 | * EINVAL means the inode cluster doesn't exist anymore. |
| @@ -148,11 +147,10 @@ xfs_nfs_get_inode( | |||
| 148 | } | 147 | } |
| 149 | 148 | ||
| 150 | if (ip->i_d.di_gen != generation) { | 149 | if (ip->i_d.di_gen != generation) { |
| 151 | xfs_iput_new(ip, XFS_ILOCK_SHARED); | 150 | IRELE(ip); |
| 152 | return ERR_PTR(-ENOENT); | 151 | return ERR_PTR(-ENOENT); |
| 153 | } | 152 | } |
| 154 | 153 | ||
| 155 | xfs_iunlock(ip, XFS_ILOCK_SHARED); | ||
| 156 | return VFS_I(ip); | 154 | return VFS_I(ip); |
| 157 | } | 155 | } |
| 158 | 156 | ||
