From: Enrico Scholz Date: Fri, 20 Feb 2004 17:01:12 +0000 (+0000) Subject: obsoleted X-Git-Tag: VERSION_0_10~597 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5dd2d4456d3c28b53fb8e2613f52bb3c6754f0f8;hp=19b505f485927357115dcd74d4576f5c7f4dd995;p=util-vserver.git obsoleted git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@966 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/lib/fscompat_getiattr-v13.hc b/util-vserver/lib/fscompat_getiattr-v13.hc deleted file mode 100644 index faa9002..0000000 --- a/util-vserver/lib/fscompat_getiattr-v13.hc +++ /dev/null @@ -1,33 +0,0 @@ -// $Id$ --*- c -*-- - -// Copyright (C) 2004 Enrico Scholz -// -// This program 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; version 2 of the License. -// -// This program 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, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -#ifdef HAVE_CONFIG_H -# include -#endif - -inline static ALWAYSINLINE int -vc_get_iattr_compat_v13(char const UNUSED *filename, dev_t dev, ino_t ino, - xid_t *xid, uint32_t *flags, uint32_t *mask) -{ - int rc; - - rc = vc_get_iattr(dev, ino, xid, flags, mask); - if (xid) *xid = CTX_KERNEL2USER(*xid); - - return rc; -} diff --git a/util-vserver/lib/fscompat_getiattr.c b/util-vserver/lib/fscompat_getiattr.c deleted file mode 100644 index b7a1ead..0000000 --- a/util-vserver/lib/fscompat_getiattr.c +++ /dev/null @@ -1,55 +0,0 @@ -// $Id$ --*- c -*-- - -// Copyright (C) 2004 Enrico Scholz -// -// This program 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; version 2 of the License. -// -// This program 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, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include "vserver.h" -#include - -#if defined(VC_ENABLE_API_FSCOMPAT) && defined(VC_ENABLE_API_V13) -# define VC_MULTIVERSION_SYSCALL 1 -#endif -#include "vserver-internal.h" - -#ifdef VC_ENABLE_API_FSCOMPAT -# include "fscompat_getiattr-fscompat.hc" -#endif - -#ifdef VC_ENABLE_API_V13 -# include "fscompat_getiattr-v13.hc" -#endif - -int -vc_get_iattr_compat(char const *filename, - dev_t dev, ino_t ino, - xid_t * xid, uint32_t * flags, uint32_t * mask, - mode_t const UNUSED *mode) -{ - if ( (mask==0) || - ((*mask&VC_IATTR_XID) && xid==0) || - ((*mask&~VC_IATTR_XID) && flags==0) ) { - errno = EINVAL; - return -1; - } - if ( flags ) *flags &= ~*mask; - - CALL_VC(CALL_VC_V13 (vc_get_iattr_compat, filename, dev, ino, xid, flags, mask), - CALL_VC_FSCOMPAT(vc_get_iattr_compat, filename, dev, ino, xid, flags, mask, mode)); -} diff --git a/util-vserver/lib/fscompat_setiattr-v13.hc b/util-vserver/lib/fscompat_setiattr-v13.hc deleted file mode 100644 index 1cc6700..0000000 --- a/util-vserver/lib/fscompat_setiattr-v13.hc +++ /dev/null @@ -1,29 +0,0 @@ -// $Id$ --*- c -*-- - -// Copyright (C) 2004 Enrico Scholz -// -// This program 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; version 2 of the License. -// -// This program 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, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -#ifdef HAVE_CONFIG_H -# include -#endif - -inline static ALWAYSINLINE int -vc_set_iattr_compat_v13(char const UNUSED *filename, - dev_t dev, ino_t ino, xid_t xid, - uint32_t flags, uint32_t mask) -{ - return vc_set_iattr(dev, ino, CTX_USER2KERNEL(xid), flags, mask); -} diff --git a/util-vserver/lib/fscompat_setiattr.c b/util-vserver/lib/fscompat_setiattr.c deleted file mode 100644 index 0eec70b..0000000 --- a/util-vserver/lib/fscompat_setiattr.c +++ /dev/null @@ -1,47 +0,0 @@ -// $Id$ --*- c -*-- - -// Copyright (C) 2004 Enrico Scholz -// -// This program 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; version 2 of the License. -// -// This program 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, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include "vserver.h" -#include - -#if defined(VC_ENABLE_API_FSCOMPAT) && defined(VC_ENABLE_API_V13) -# define VC_MULTIVERSION_SYSCALL 1 -#endif -#include "vserver-internal.h" - -#ifdef VC_ENABLE_API_FSCOMPAT -# include "fscompat_setiattr-fscompat.hc" -#endif - -#ifdef VC_ENABLE_API_V13 -# include "fscompat_setiattr-v13.hc" -#endif - -int -vc_set_iattr_compat(char const *filename, - dev_t dev, ino_t ino, xid_t xid, - uint32_t flags, uint32_t mask, - mode_t const UNUSED *mode) -{ - CALL_VC(CALL_VC_V13 (vc_set_iattr_compat, filename, dev, ino, xid, flags, mask), - CALL_VC_FSCOMPAT(vc_set_iattr_compat, filename, dev, ino, xid, flags, mask, mode)); -}