3 files changed, 13 insertions, 17 deletions

diff --git a/fs/xfs/linux-2.6/mutex.h b/fs/xfs/linux-2.6/mutex.h
index ce773d89a923..d3369b6ca168 100644
--- a/fs/xfs/linux-2.6/mutex.h
+++ b/fs/xfs/linux-2.6/mutex.h
@@ -19,7 +19,7 @@
 #define __XFS_SUPPORT_MUTEX_H__
 
 #include <linux/spinlock.h>
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 
 /*
  * Map the mutex'es from IRIX to Linux semaphores.
@@ -28,12 +28,8 @@
  * callers.
  */
 #define MUTEX_DEFAULT           0x0
-typedef struct semaphore        mutex_t;
 
-#define mutex_init(lock, type, name)            sema_init(lock, 1)
-#define mutex_destroy(lock)                     sema_init(lock, -99)
-#define mutex_lock(lock, num)                   down(lock)
-#define mutex_trylock(lock)                     (down_trylock(lock) ? 0 : 1)
-#define mutex_unlock(lock)                      up(lock)
+typedef struct mutex            mutex_t;
+//#define mutex_destroy(lock)                   do{}while(0)
 
 #endif /* __XFS_SUPPORT_MUTEX_H__ */
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
index 14215a7db59f..41c478bb1ffc 100644
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@ -203,7 +203,7 @@ validate_fields(
                 ip->i_nlink = va.va_nlink;
                 ip->i_blocks = va.va_nblocks;
 
-                /* we're under i_sem so i_size can't change under us */
+                /* we're under i_mutex so i_size can't change under us */
                 if (i_size_read(ip) != va.va_size)
                         i_size_write(ip, va.va_size);
         }
diff --git a/fs/xfs/linux-2.6/xfs_lrw.c b/fs/xfs/linux-2.6/xfs_lrw.c
index 279e9bc92aba..5675117ef227 100644
--- a/fs/xfs/linux-2.6/xfs_lrw.c
+++ b/fs/xfs/linux-2.6/xfs_lrw.c
@@ -254,7 +254,7 @@ xfs_read(
         }
 
         if (unlikely(ioflags & IO_ISDIRECT))
-                down(&inode->i_sem);
+                mutex_lock(&inode->i_mutex);
         xfs_ilock(ip, XFS_IOLOCK_SHARED);
 
         if (DM_EVENT_ENABLED(vp->v_vfsp, ip, DM_EVENT_READ) &&
@@ -286,7 +286,7 @@ xfs_read(
 
 unlock_isem:
         if (unlikely(ioflags & IO_ISDIRECT))
-                up(&inode->i_sem);
+                mutex_unlock(&inode->i_mutex);
         return ret;
 }
 
@@ -655,7 +655,7 @@ relock:
                 iolock = XFS_IOLOCK_EXCL;
                 locktype = VRWLOCK_WRITE;
 
-                down(&inode->i_sem);
+                mutex_lock(&inode->i_mutex);
         } else {
                 iolock = XFS_IOLOCK_SHARED;
                 locktype = VRWLOCK_WRITE_DIRECT;
@@ -686,7 +686,7 @@ start:
                 int             dmflags = FILP_DELAY_FLAG(file);
 
                 if (need_isem)
-                        dmflags |= DM_FLAGS_ISEM;
+                        dmflags |= DM_FLAGS_IMUX;
 
                 xfs_iunlock(xip, XFS_ILOCK_EXCL);
                 error = XFS_SEND_DATA(xip->i_mount, DM_EVENT_WRITE, vp,
@@ -772,7 +772,7 @@ retry:
                 if (need_isem) {
                         /* demote the lock now the cached pages are gone */
                         XFS_ILOCK_DEMOTE(mp, io, XFS_IOLOCK_EXCL);
-                        up(&inode->i_sem);
+                        mutex_unlock(&inode->i_mutex);
 
                         iolock = XFS_IOLOCK_SHARED;
                         locktype = VRWLOCK_WRITE_DIRECT;
@@ -817,14 +817,14 @@ retry:
 
                 xfs_rwunlock(bdp, locktype);
                 if (need_isem)
-                        up(&inode->i_sem);
+                        mutex_unlock(&inode->i_mutex);
                 error = XFS_SEND_NAMESP(xip->i_mount, DM_EVENT_NOSPACE, vp,
                                 DM_RIGHT_NULL, vp, DM_RIGHT_NULL, NULL, NULL,
                                 0, 0, 0); /* Delay flag intentionally  unused */
                 if (error)
                         goto out_nounlocks;
                 if (need_isem)
-                        down(&inode->i_sem);
+                        mutex_lock(&inode->i_mutex);
                 xfs_rwlock(bdp, locktype);
                 pos = xip->i_d.di_size;
                 ret = 0;
@@ -926,7 +926,7 @@ retry:
         
                 xfs_rwunlock(bdp, locktype);
                 if (need_isem)
-                        up(&inode->i_sem);
+                        mutex_unlock(&inode->i_mutex);
 
                 error = sync_page_range(inode, mapping, pos, ret);
                 if (!error)
@@ -938,7 +938,7 @@ retry:
         xfs_rwunlock(bdp, locktype);
  out_unlock_isem:
         if (need_isem)
-                up(&inode->i_sem);
+                mutex_unlock(&inode->i_mutex);
  out_nounlocks:
         return -error;
 }