diff options
Diffstat (limited to 'xlators/features/trash/src/trash.h')
| -rw-r--r-- | xlators/features/trash/src/trash.h | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/xlators/features/trash/src/trash.h b/xlators/features/trash/src/trash.h index e1a1c314d..9a7c03361 100644 --- a/xlators/features/trash/src/trash.h +++ b/xlators/features/trash/src/trash.h @@ -1,22 +1,12 @@ /* - Copyright (c) 2006-2009 Gluster, Inc. <http://www.gluster.com> - This file is part of GlusterFS. + 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. */ - #ifndef __TRASH_H__ #define __TRASH_H__ @@ -59,8 +49,8 @@ struct trash_struct { char origpath[PATH_MAX]; char newpath[PATH_MAX]; int32_t loop_count; - struct stat preparent; - struct stat postparent; + struct iatt preparent; + struct iatt postparent; }; typedef struct trash_struct trash_local_t; @@ -77,11 +67,11 @@ struct trash_priv { }; typedef struct trash_priv trash_private_t; -#define TRASH_STACK_UNWIND(frame, params ...) do { \ +#define TRASH_STACK_UNWIND(op, frame, params ...) do { \ trash_local_t *__local = NULL; \ __local = frame->local; \ frame->local = NULL; \ - STACK_UNWIND (frame, params); \ + STACK_UNWIND_STRICT (op, frame, params); \ trash_local_wipe (__local); \ } while (0) |