summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/dlm/dlmmaster.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-08-15 21:31:36 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2006-08-15 21:31:36 +0200
commit80914d97aa0c61fbfd8eadd120c863b6229f0809 (patch)
tree4d4d08a8ccbfcdabb40cc457badfd053056a7bdd /fs/ocfs2/dlm/dlmmaster.c
parent[PATCH] fcntl(F_SETSIG) fix (diff)
parentocfs2: allocation hints (diff)
downloadlinux-80914d97aa0c61fbfd8eadd120c863b6229f0809.tar.xz
linux-80914d97aa0c61fbfd8eadd120c863b6229f0809.zip
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
Diffstat (limited to 'fs/ocfs2/dlm/dlmmaster.c')
-rw-r--r--fs/ocfs2/dlm/dlmmaster.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 1b8346dd0572..9503240ef0e5 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -2375,7 +2375,6 @@ leave:
mlog(0, "returning %d\n", ret);
return ret;
}
-EXPORT_SYMBOL_GPL(dlm_migrate_lockres);
int dlm_lock_basts_flushed(struct dlm_ctxt *dlm, struct dlm_lock *lock)
{