Merge uncontroversial parts of branch 'readlink' of git://git.kernel.org/pub/scm...

[karo-tx-linux.git] / fs / xfs / xfs_pnfs.c

diff --git a/fs/xfs/xfs_pnfs.c b/fs/xfs/xfs_pnfs.c
index 93a7aafa56d6fdd9b76246f4e5c3196fdc17f985..2f2dc3c09ad008a75fa0ffba6fd5d7aed392c162 100644 (file)
--- a/fs/xfs/xfs_pnfs.c
+++ b/fs/xfs/xfs_pnfs.c
@@ -32,8 +32,7 @@
 int
 xfs_break_layouts(
        struct inode            *inode,
-       uint                    *iolock,
-       bool                    with_imutex)
+       uint                    *iolock)
 {
        struct xfs_inode        *ip = XFS_I(inode);
        int                     error;
@@ -42,12 +41,8 @@ xfs_break_layouts(
 
        while ((error = break_layout(inode, false) == -EWOULDBLOCK)) {
                xfs_iunlock(ip, *iolock);
-               if (with_imutex && (*iolock & XFS_IOLOCK_EXCL))
-                       inode_unlock(inode);
                error = break_layout(inode, true);
                *iolock = XFS_IOLOCK_EXCL;
-               if (with_imutex)
-                       inode_lock(inode);
                xfs_ilock(ip, *iolock);
        }