From c376db2958575ea2afd688a27aec447a3d2d845d Mon Sep 17 00:00:00 2001 From: Johann Lombardi Date: Fri, 27 Aug 2010 23:32:11 +0200 Subject: [PATCH] b=23645 remove warning printed at mount time with 2.6.32 Make sure inode mutex on the CWD is taken when calling lookup_on_len(). --- lustre/mds/mds_fs.c | 4 ++-- lustre/mgc/mgc_request.c | 4 ++-- lustre/mgs/mgs_fs.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lustre/mds/mds_fs.c b/lustre/mds/mds_fs.c index ed0d7d8..58ee4d6 100644 --- a/lustre/mds/mds_fs.c +++ b/lustre/mds/mds_fs.c @@ -771,8 +771,8 @@ int mds_fs_setup(struct obd_device *obd, struct vfsmount *mnt) dput(dentry); - dentry = lookup_one_len("__iopen__", cfs_fs_pwd(current->fs), - strlen("__iopen__")); + dentry = ll_lookup_one_len("__iopen__", cfs_fs_pwd(current->fs), + strlen("__iopen__")); if (IS_ERR(dentry)) { rc = PTR_ERR(dentry); CERROR("cannot lookup __iopen__ directory: rc = %d\n", rc); diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c index 11288b8..faafe97 100644 --- a/lustre/mgc/mgc_request.c +++ b/lustre/mgc/mgc_request.c @@ -414,8 +414,8 @@ static int mgc_fs_setup(struct obd_device *obd, struct super_block *sb, obd->obd_lvfs_ctxt.fs = get_ds(); push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); - dentry = lookup_one_len(MOUNT_CONFIGS_DIR, cfs_fs_pwd(current->fs), - strlen(MOUNT_CONFIGS_DIR)); + dentry = ll_lookup_one_len(MOUNT_CONFIGS_DIR, cfs_fs_pwd(current->fs), + strlen(MOUNT_CONFIGS_DIR)); pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); if (IS_ERR(dentry)) { err = PTR_ERR(dentry); diff --git a/lustre/mgs/mgs_fs.c b/lustre/mgs/mgs_fs.c index 9455963..e6e733f 100644 --- a/lustre/mgs/mgs_fs.c +++ b/lustre/mgs/mgs_fs.c @@ -222,8 +222,8 @@ int mgs_fs_setup(struct obd_device *obd, struct vfsmount *mnt) /* Need the iopen dir for fid2dentry, required by LLOG_ORIGIN_HANDLE_READ_HEADER */ - dentry = lookup_one_len("__iopen__", cfs_fs_pwd(current->fs), - strlen("__iopen__")); + dentry = ll_lookup_one_len("__iopen__", cfs_fs_pwd(current->fs), + strlen("__iopen__")); if (IS_ERR(dentry)) { rc = PTR_ERR(dentry); CERROR("cannot lookup __iopen__ directory: rc = %d\n", rc); -- 1.8.3.1