From a18e760da85b9b3154ff6011ce4dd0f8afc94d00 Mon Sep 17 00:00:00 2001 From: yangsheng Date: Thu, 24 Jul 2008 14:56:45 +0000 Subject: [PATCH] Branch b1_8_gate b=15308 i=johann, shadow, zhenyu.xu, brian Update to SLES10 SP2 kernel-2.6.16.60-0.23 and update to OFED-1.3.1. --- lustre/obdclass/llog_lvfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lustre/obdclass/llog_lvfs.c b/lustre/obdclass/llog_lvfs.c index 2f0e528..5876981 100644 --- a/lustre/obdclass/llog_lvfs.c +++ b/lustre/obdclass/llog_lvfs.c @@ -725,6 +725,7 @@ static int llog_lvfs_destroy(struct llog_handle *handle) if (strcmp(fdentry->d_parent->d_name.name, dir) == 0) { struct inode *inode = fdentry->d_parent->d_inode; struct lvfs_run_ctxt saved; + struct vfsmount *mnt = mntget(handle->lgh_file->f_vfsmnt); push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); dget(fdentry); @@ -732,9 +733,10 @@ static int llog_lvfs_destroy(struct llog_handle *handle) if (rc == 0) { LOCK_INODE_MUTEX(inode); - rc = vfs_unlink(inode, fdentry); + rc = ll_vfs_unlink(inode, fdentry, mnt); UNLOCK_INODE_MUTEX(inode); } + mntput(mnt); dput(fdentry); pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL); -- 1.8.3.1