diff options
author | Dave Airlie <airlied@redhat.com> | 2010-07-07 18:37:34 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-07-07 18:37:34 +1000 |
commit | 6dbe7465713f0e45f0e867105ca944978d57346e (patch) | |
tree | 448d7e5f08fa59ca15277d6567825abd74e08e60 /fs/xfs/xfs_mount.c | |
parent | 023eb571a1d0eae738326042dcffa974257eb8c8 (diff) | |
parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) |
Merge tag 'v2.6.35-rc4' into drm-testing
Diffstat (limited to 'fs/xfs/xfs_mount.c')
-rw-r--r-- | fs/xfs/xfs_mount.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index d59f4e8bedc..69f62d8b281 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c @@ -1300,7 +1300,7 @@ xfs_mountfs( * Get and sanity-check the root inode. * Save the pointer to it in the mount structure. */ - error = xfs_iget(mp, NULL, sbp->sb_rootino, 0, XFS_ILOCK_EXCL, &rip, 0); + error = xfs_iget(mp, NULL, sbp->sb_rootino, 0, XFS_ILOCK_EXCL, &rip); if (error) { cmn_err(CE_WARN, "XFS: failed to read root inode"); goto out_log_dealloc; |