xfs: vectorise remaining shortform dir2 ops

Following from the initial patch to introduce the directory
operations vector, convert the rest of the shortform directory
operations to use vectored ops rather than superblock feature
checks. This further reduces the size of the built binary:

   text    data     bss     dec     hex filename
 794490   96802    1096  892388   d9de4 fs/xfs/xfs.o.orig
 792986   96802    1096  890884   d9804 fs/xfs/xfs.o.p1
 792350   96802    1096  890248   d9588 fs/xfs/xfs.o.p2

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ben Myers <bpm@sgi.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/xfs/xfs_dir2_block.c b/fs/xfs/xfs_dir2_block.c
index 9d86b6f9e80f..960f3ab526f6 100644
--- a/fs/xfs/xfs_dir2_block.c
+++ b/fs/xfs/xfs_dir2_block.c
@@ -1173,7 +1173,7 @@ xfs_dir2_sf_to_block(
          * Create entry for ..
          */
         dep = xfs_dir3_data_dotdot_entry_p(mp, hdr);
-        dep->inumber = cpu_to_be64(xfs_dir2_sf_get_parent_ino(sfp));
+        dep->inumber = cpu_to_be64(dp->d_ops->sf_get_parent_ino(sfp));
         dep->namelen = 2;
         dep->name[0] = dep->name[1] = '.';
         xfs_dir3_dirent_put_ftype(mp, dep, XFS_DIR3_FT_DIR);
@@ -1222,10 +1222,10 @@ xfs_dir2_sf_to_block(
                  * Copy a real entry.
                  */
                 dep = (xfs_dir2_data_entry_t *)((char *)hdr + newoffset);
-                dep->inumber = cpu_to_be64(xfs_dir3_sfe_get_ino(mp, sfp, sfep));
+                dep->inumber = cpu_to_be64(dp->d_ops->sf_get_ino(sfp, sfep));
                 dep->namelen = sfep->namelen;
                 xfs_dir3_dirent_put_ftype(mp, dep,
-                                        xfs_dir3_sfe_get_ftype(mp, sfp, sfep));
+                                          dp->d_ops->sf_get_ftype(sfep));
                 memcpy(dep->name, sfep->name, dep->namelen);
                 tagp = xfs_dir3_data_entry_tag_p(mp, dep);
                 *tagp = cpu_to_be16((char *)dep - (char *)hdr);