diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-15 12:31:36 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-15 12:31:36 -0700 |
| commit | 80914d97aa0c61fbfd8eadd120c863b6229f0809 (patch) | |
| tree | 4d4d08a8ccbfcdabb40cc457badfd053056a7bdd /fs/ocfs2/dlm/dlmmaster.c | |
| parent | 74361cb6828398a96167b3234e186fbd731e5f30 (diff) | |
| parent | 883d4cae4a2b01a05193cf2665c77b7489a8b6a0 (diff) | |
| download | kernel_samsung_crespo-80914d97aa0c61fbfd8eadd120c863b6229f0809.zip kernel_samsung_crespo-80914d97aa0c61fbfd8eadd120c863b6229f0809.tar.gz kernel_samsung_crespo-80914d97aa0c61fbfd8eadd120c863b6229f0809.tar.bz2 | |
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.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c index 1b8346d..9503240 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) { |