diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 13:36:30 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 13:36:30 -0500 |
| commit | 52833e897fd8c6f62b3e5e27291fa9bc803f7460 (patch) | |
| tree | cfe90047ee6c7402674a29ec7258319142b96ff1 /fs/xfs/linux-2.6 | |
| parent | 8d042218b075de3cdbe066198515b3521553746e (diff) | |
| parent | 4ee29f6a52158cea526b16a44ae38643946103ec (diff) | |
Merge branch 'linus_origin' into hotfixes
Diffstat (limited to 'fs/xfs/linux-2.6')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_ioctl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c index 4c82a050a3a8..a9952e490ac9 100644 --- a/fs/xfs/linux-2.6/xfs_ioctl.c +++ b/fs/xfs/linux-2.6/xfs_ioctl.c | |||
| @@ -91,10 +91,10 @@ xfs_find_handle( | |||
| 91 | if (error) | 91 | if (error) |
| 92 | return error; | 92 | return error; |
| 93 | 93 | ||
| 94 | ASSERT(nd.dentry); | 94 | ASSERT(nd.path.dentry); |
| 95 | ASSERT(nd.dentry->d_inode); | 95 | ASSERT(nd.path.dentry->d_inode); |
| 96 | inode = igrab(nd.dentry->d_inode); | 96 | inode = igrab(nd.path.dentry->d_inode); |
| 97 | path_release(&nd); | 97 | path_put(&nd.path); |
| 98 | break; | 98 | break; |
| 99 | } | 99 | } |
| 100 | 100 | ||