diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-28 00:01:34 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-28 00:01:34 -0400 |
| commit | 1dbbb6077426f8ce63d6a59c5ac6613e1689cbde (patch) | |
| tree | 6141d4d7a8eb7c557705bdfa764137d4fd2e4924 /fs/locks.c | |
| parent | d09e860cf07e7c9ee12920a09f5080e30a12a23a (diff) | |
| parent | 064922a805ec7aadfafdd27aa6b4908d737c3c1d (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/locks.c')
| -rw-r--r-- | fs/locks.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/locks.c b/fs/locks.c index e1ea2fe03681..44d9a6a7ec50 100644 --- a/fs/locks.c +++ b/fs/locks.c | |||
| @@ -236,6 +236,7 @@ void __locks_copy_lock(struct file_lock *new, const struct file_lock *fl) | |||
| 236 | new->fl_ops = NULL; | 236 | new->fl_ops = NULL; |
| 237 | new->fl_lmops = NULL; | 237 | new->fl_lmops = NULL; |
| 238 | } | 238 | } |
| 239 | EXPORT_SYMBOL(__locks_copy_lock); | ||
| 239 | 240 | ||
| 240 | void locks_copy_lock(struct file_lock *new, struct file_lock *fl) | 241 | void locks_copy_lock(struct file_lock *new, struct file_lock *fl) |
| 241 | { | 242 | { |