Branch HEAD

b=20892

i=robert, yangsheng
Author:johann

Cleanup the VFS_RENAME config check.

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 4322364..edca74d 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -1792,23 +1792,6 @@ AC_DEFUN([LC_LINUX_FIEMAP_H],
 [])
 ])
 
-# 2.6.17 super_block use s_vfs_rename_mutex instead of s_vfs_rename_sem
-AC_DEFUN([LC_VFS_RENAME_MUTEX],
-[AC_MSG_CHECKING([super_block has s_vfs_rename_mutex])
-LB_LINUX_TRY_COMPILE([
-        #include <linux/fs.h>
-],[
-        struct super_block sb;
-        mutex_lock(&sb.s_vfs_rename_mutex);
-],[
-        AC_DEFINE(HAVE_VFS_RENAME_MUTEX, 1,
-                [super_block has s_vfs_rename_mutex])
-        AC_MSG_RESULT([yes])
-],[
-        AC_MSG_RESULT([no])
-])
-])
-
 #
 # LC_PROG_LINUX
 #
@@ -1884,7 +1867,6 @@ AC_DEFUN([LC_PROG_LINUX],
          # 2.6.17
          LC_INODE_IPRIVATE
          LC_DQUOTOFF_MUTEX
-         LC_VFS_RENAME_MUTEX
 
          # 2.6.18
          LC_NR_PAGECACHE

diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h
index d65fc62..46b72a7 100644 (file)
--- a/lustre/include/linux/lustre_compat25.h
+++ b/lustre/include/linux/lustre_compat25.h
@@ -777,14 +777,5 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount)
                 return -ENOSYS;
 }
 
-
-#ifdef HAVE_VFS_RENAME_MUTEX
-#define VFS_RENAME_LOCK(inode) mutex_lock(&((inode)->i_sb->s_vfs_rename_mutex))
-#define VFS_RENAME_UNLOCK(inode) mutex_unlock(&((inode)->i_sb->s_vfs_rename_mutex))
-#else
-#define VFS_RENAME_LOCK(inode) down(&((inode)->i_sb->s_vfs_rename_sem))
-#define VFS_RENAME_UNLOCK(inode) up(&((inode)->i_sb->s_vfs_rename_sem))
-#endif
-
 #endif /* __KERNEL__ */
 #endif /* _COMPAT25_H */

diff --git a/lustre/mds/mds_fs.c b/lustre/mds/mds_fs.c
index 8619ae5..6c45e4a 100644 (file)
--- a/lustre/mds/mds_fs.c
+++ b/lustre/mds/mds_fs.c
@@ -123,12 +123,10 @@ int mds_obd_create(struct obd_export *exp, struct obdo *oa,
         if (IS_ERR(handle))
                 GOTO(out_dput, rc = PTR_ERR(handle));
 
-        VFS_RENAME_LOCK(mds->mds_objects_dir->d_inode);
         rc = ll_vfs_rename(mds->mds_objects_dir->d_inode, filp->f_dentry,
                            filp->f_vfsmnt, mds->mds_objects_dir->d_inode,
                            new_child, filp->f_vfsmnt);
 
-        VFS_RENAME_UNLOCK(mds->mds_objects_dir->d_inode);
         if (rc)
                 CERROR("error renaming new object "LPU64":%u: rc %d\n",
                        oa->o_id, oa->o_generation, rc);