diff options
Diffstat (limited to 'xlators/meta/src/meta.c')
| -rw-r--r-- | xlators/meta/src/meta.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/xlators/meta/src/meta.c b/xlators/meta/src/meta.c index face2fe70..e69719f3c 100644 --- a/xlators/meta/src/meta.c +++ b/xlators/meta/src/meta.c @@ -1,22 +1,12 @@ /* - Copyright (c) 2006-2009 Gluster, Inc. <http://www.gluster.com> + Copyright (c) 2006-2012 Red Hat, Inc. <http://www.redhat.com> This file is part of GlusterFS. - GlusterFS is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. - - GlusterFS is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see - <http://www.gnu.org/licenses/>. + This file is licensed to you under your choice of the GNU Lesser + General Public License, version 3 or any later version (LGPLv3 or + later), or the GNU General Public License, version 2 (GPLv2), in all + cases as published by the Free Software Foundation. */ - #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> @@ -1136,7 +1126,7 @@ meta_lk_cbk (call_frame_t *frame, xlator_t *this, int32_t op_ret, int32_t op_errno, - struct flock *lock) + struct gf_flock *lock) { STACK_UNWIND (frame, op_ret, @@ -1150,7 +1140,7 @@ meta_lk (call_frame_t *frame, xlator_t *this, dict_t *file, int32_t cmd, - struct flock *lock) + struct gf_flock *lock) { STACK_WIND (frame, meta_lk_cbk, |