Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec

[~andy/linux] / fs / xfs / xfs_attr.c

diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/xfs_attr.c
index b86127072ac3c2b9bd201b34cf208c3f1735cd68..01b6a0102fbdd4d153612740d95c4f00fda691f7 100644 (file)
--- a/fs/xfs/xfs_attr.c
+++ b/fs/xfs/xfs_attr.c
@@ -164,6 +164,7 @@ xfs_attr_get(
 {
        int             error;
        struct xfs_name xname;
+       uint            lock_mode;
 
        XFS_STATS_INC(xs_attr_get);
 
@@ -174,9 +175,9 @@ xfs_attr_get(
        if (error)
                return error;
 
-       xfs_ilock(ip, XFS_ILOCK_SHARED);
+       lock_mode = xfs_ilock_attr_map_shared(ip);
        error = xfs_attr_get_int(ip, &xname, value, valuelenp, flags);
-       xfs_iunlock(ip, XFS_ILOCK_SHARED);
+       xfs_iunlock(ip, lock_mode);
        return(error);
 }