aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2006-06-18 18:39:16 -0400
committerNathan Scott <nathans@sgi.com>2006-06-18 18:39:16 -0400
commit1d47bec290a6f1f366192946840efef5076d9fc7 (patch)
tree06c46c4cdf4eba2b8bae974d443b310bd81df2cc /fs/xfs
parentd7ede1aa5dfff53e76dbabac5b8087341686f662 (diff)
[XFS] Remove unnecessary local from open_exec dmapi path.
SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26247a Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/linux-2.6/xfs_file.c23
1 files changed, 9 insertions, 14 deletions
diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c
index 89b1a7421357..cf65a8364d5a 100644
--- a/fs/xfs/linux-2.6/xfs_file.c
+++ b/fs/xfs/linux-2.6/xfs_file.c
@@ -522,23 +522,18 @@ xfs_file_open_exec(
522 struct inode *inode) 522 struct inode *inode)
523{ 523{
524 bhv_vnode_t *vp = vn_from_inode(inode); 524 bhv_vnode_t *vp = vn_from_inode(inode);
525 xfs_mount_t *mp = XFS_VFSTOM(vp->v_vfsp);
526 int error = 0;
527 xfs_inode_t *ip;
528 525
529 if (vp->v_vfsp->vfs_flag & VFS_DMI) { 526 if (unlikely(vp->v_vfsp->vfs_flag & VFS_DMI)) {
530 ip = xfs_vtoi(vp); 527 xfs_mount_t *mp = XFS_VFSTOM(vp->v_vfsp);
531 if (!ip) { 528 xfs_inode_t *ip = xfs_vtoi(vp);
532 error = -EINVAL; 529
533 goto open_exec_out; 530 if (!ip)
534 } 531 return -EINVAL;
535 if (DM_EVENT_ENABLED(vp->v_vfsp, ip, DM_EVENT_READ)) { 532 if (DM_EVENT_ENABLED(vp->v_vfsp, ip, DM_EVENT_READ))
536 error = -XFS_SEND_DATA(mp, DM_EVENT_READ, vp, 533 return -XFS_SEND_DATA(mp, DM_EVENT_READ, vp,
537 0, 0, 0, NULL); 534 0, 0, 0, NULL);
538 }
539 } 535 }
540open_exec_out: 536 return 0;
541 return error;
542} 537}
543#endif /* HAVE_FOP_OPEN_EXEC */ 538#endif /* HAVE_FOP_OPEN_EXEC */
544 539