xfs: rename xfs_ilock_map_shared

Make it clear that we're only locking against the extent map on the data
fork.  Also clean the function up a little bit.

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

diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 71c8c9d2b8826a0ed22d886fb3327d2ff0784fc3..a26739451b535cf02a8016c423583f76a26bac72 100644 (file)
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -1217,7 +1217,7 @@ __xfs_get_blocks(
                lockmode = XFS_ILOCK_EXCL;
                xfs_ilock(ip, lockmode);
        } else {
-               lockmode = xfs_ilock_map_shared(ip);
+               lockmode = xfs_ilock_data_map_shared(ip);
        }
 
        ASSERT(offset <= mp->m_super->s_maxbytes);

diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 2f32d7ee1411ce61010a464803291cbbfeb274fd..460aeb87c04e734d33e19730de81e1c3d0b15999 100644 (file)
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -632,7 +632,7 @@ xfs_getbmap(
                 */
        }
 
-       lock = xfs_ilock_map_shared(ip);
+       lock = xfs_ilock_data_map_shared(ip);
 
        /*
         * Don't let nex be bigger than the number of extents

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 349bfa28aa3d924676dad68212cfd2811fd948fc..e001215926326c6a87ce1d5d9887a11aafeb84ca 100644 (file)
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -912,7 +912,7 @@ xfs_dir_open(
         * If there are any blocks, read-ahead block 0 as we're almost
         * certain to have the next operation be a read there.
         */
-       mode = xfs_ilock_map_shared(ip);
+       mode = xfs_ilock_data_map_shared(ip);
        if (ip->i_d.di_nextents > 0)
                xfs_dir3_data_readahead(NULL, ip, 0, -1);
        xfs_iunlock(ip, mode);
@@ -1215,7 +1215,7 @@ xfs_seek_data(
        uint                    lock;
        int                     error;
 
-       lock = xfs_ilock_map_shared(ip);
+       lock = xfs_ilock_data_map_shared(ip);
 
        isize = i_size_read(inode);
        if (start >= isize) {
@@ -1319,7 +1319,7 @@ xfs_seek_hole(
        if (XFS_FORCED_SHUTDOWN(mp))
                return -XFS_ERROR(EIO);
 
-       lock = xfs_ilock_map_shared(ip);
+       lock = xfs_ilock_data_map_shared(ip);
 
        isize = i_size_read(inode);
        if (start >= isize) {

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 967f90625eae8d5ecfecfd2b10c544bbc764611e..fdd4837833658c90841497b9d95c122ec47ad2b5 100644 (file)
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -91,20 +91,15 @@ xfs_get_extsz_hint(
  * xfs_iunlock() call.
  */
 uint
-xfs_ilock_map_shared(
-       xfs_inode_t     *ip)
+xfs_ilock_data_map_shared(
+       struct xfs_inode        *ip)
 {
-       uint    lock_mode;
+       uint                    lock_mode = XFS_ILOCK_SHARED;
 
-       if ((ip->i_d.di_format == XFS_DINODE_FMT_BTREE) &&
-           ((ip->i_df.if_flags & XFS_IFEXTENTS) == 0)) {
+       if (ip->i_d.di_format == XFS_DINODE_FMT_BTREE &&
+           (ip->i_df.if_flags & XFS_IFEXTENTS) == 0)
                lock_mode = XFS_ILOCK_EXCL;
-       } else {
-               lock_mode = XFS_ILOCK_SHARED;
-       }
-
        xfs_ilock(ip, lock_mode);
-
        return lock_mode;
 }
 
@@ -575,7 +570,7 @@ xfs_lookup(
        if (XFS_FORCED_SHUTDOWN(dp->i_mount))
                return XFS_ERROR(EIO);
 
-       lock_mode = xfs_ilock_map_shared(dp);
+       lock_mode = xfs_ilock_data_map_shared(dp);
        error = xfs_dir_lookup(NULL, dp, name, &inum, ci_name);
        xfs_iunlock(dp, lock_mode);
 

diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index 5e2bd17cf2bef03cbe32a0f6415582ad88ad03aa..fde368624ea72969b7b3763923298538be54df7b 100644 (file)
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -337,7 +337,7 @@ int         xfs_ilock_nowait(xfs_inode_t *, uint);
 void           xfs_iunlock(xfs_inode_t *, uint);
 void           xfs_ilock_demote(xfs_inode_t *, uint);
 int            xfs_isilocked(xfs_inode_t *, uint);
-uint           xfs_ilock_map_shared(xfs_inode_t *);
+uint           xfs_ilock_data_map_shared(struct xfs_inode *);
 int            xfs_ialloc(struct xfs_trans *, xfs_inode_t *, umode_t,
                           xfs_nlink_t, xfs_dev_t, prid_t, int,
                           struct xfs_buf **, xfs_inode_t **);