aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2005-06-28 23:44:58 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-29 00:20:31 -0400
commit334a13ec3d01a1a4b4f2249735b793105cb4a519 (patch)
tree10d9f23026d8c1c75f172751322acaba7ff63d81 /fs/nfsd
parentaade0e82739f4b24c5b952de68c8d794459ad531 (diff)
[PATCH] really remove xattr_acl.h
Looks like it sneaked back with the NFS ACL merge.. Signed-off-by: Christoph Hellwig <hch@lst.de> Cc: Trond Myklebust <trond.myklebust@fys.uio.no> Cc: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/vfs.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index de340ffd33c3..be24ead89d94 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -46,10 +46,9 @@
46#include <linux/nfsd/nfsfh.h> 46#include <linux/nfsd/nfsfh.h>
47#include <linux/quotaops.h> 47#include <linux/quotaops.h>
48#include <linux/dnotify.h> 48#include <linux/dnotify.h>
49#include <linux/xattr_acl.h>
50#include <linux/posix_acl.h> 49#include <linux/posix_acl.h>
51#ifdef CONFIG_NFSD_V4
52#include <linux/posix_acl_xattr.h> 50#include <linux/posix_acl_xattr.h>
51#ifdef CONFIG_NFSD_V4
53#include <linux/xattr.h> 52#include <linux/xattr.h>
54#include <linux/nfs4.h> 53#include <linux/nfs4.h>
55#include <linux/nfs4_acl.h> 54#include <linux/nfs4_acl.h>
@@ -1872,10 +1871,10 @@ nfsd_get_posix_acl(struct svc_fh *fhp, int type)
1872 return ERR_PTR(-EOPNOTSUPP); 1871 return ERR_PTR(-EOPNOTSUPP);
1873 switch(type) { 1872 switch(type) {
1874 case ACL_TYPE_ACCESS: 1873 case ACL_TYPE_ACCESS:
1875 name = XATTR_NAME_ACL_ACCESS; 1874 name = POSIX_ACL_XATTR_ACCESS;
1876 break; 1875 break;
1877 case ACL_TYPE_DEFAULT: 1876 case ACL_TYPE_DEFAULT:
1878 name = XATTR_NAME_ACL_DEFAULT; 1877 name = POSIX_ACL_XATTR_DEFAULT;
1879 break; 1878 break;
1880 default: 1879 default:
1881 return ERR_PTR(-EOPNOTSUPP); 1880 return ERR_PTR(-EOPNOTSUPP);
@@ -1919,17 +1918,17 @@ nfsd_set_posix_acl(struct svc_fh *fhp, int type, struct posix_acl *acl)
1919 return -EOPNOTSUPP; 1918 return -EOPNOTSUPP;
1920 switch(type) { 1919 switch(type) {
1921 case ACL_TYPE_ACCESS: 1920 case ACL_TYPE_ACCESS:
1922 name = XATTR_NAME_ACL_ACCESS; 1921 name = POSIX_ACL_XATTR_ACCESS;
1923 break; 1922 break;
1924 case ACL_TYPE_DEFAULT: 1923 case ACL_TYPE_DEFAULT:
1925 name = XATTR_NAME_ACL_DEFAULT; 1924 name = POSIX_ACL_XATTR_DEFAULT;
1926 break; 1925 break;
1927 default: 1926 default:
1928 return -EOPNOTSUPP; 1927 return -EOPNOTSUPP;
1929 } 1928 }
1930 1929
1931 if (acl && acl->a_count) { 1930 if (acl && acl->a_count) {
1932 size = xattr_acl_size(acl->a_count); 1931 size = posix_acl_xattr_size(acl->a_count);
1933 value = kmalloc(size, GFP_KERNEL); 1932 value = kmalloc(size, GFP_KERNEL);
1934 if (!value) 1933 if (!value)
1935 return -ENOMEM; 1934 return -ENOMEM;