Commit 334a13ec authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

[PATCH] really remove xattr_acl.h 



Looks like it sneaked back with the NFS ACL merge..

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent aade0e82

fs/nfs/nfs3acl.c

+7 −7
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#include <linux/nfs.h>

#include <linux/nfs3.h>

#include <linux/nfs_fs.h>

#include <linux/xattr_acl.h>

#include <linux/posix_acl_xattr.h>

#include <linux/nfsacl.h>



#define NFSDBG_FACILITY	NFSDBG_PROC
@@ -53,9 +53,9 @@ ssize_t nfs3_getxattr(struct dentry *dentry, const char *name, 
	struct posix_acl *acl;

	int type, error = 0;



	if (strcmp(name, XATTR_NAME_ACL_ACCESS) == 0)

	if (strcmp(name, POSIX_ACL_XATTR_ACCESS) == 0)

		type = ACL_TYPE_ACCESS;

	else if (strcmp(name, XATTR_NAME_ACL_DEFAULT) == 0)

	else if (strcmp(name, POSIX_ACL_XATTR_DEFAULT) == 0)

		type = ACL_TYPE_DEFAULT;

	else

		return -EOPNOTSUPP;
@@ -82,9 +82,9 @@ int nfs3_setxattr(struct dentry *dentry, const char *name, 
	struct posix_acl *acl;

	int type, error;



	if (strcmp(name, XATTR_NAME_ACL_ACCESS) == 0)

	if (strcmp(name, POSIX_ACL_XATTR_ACCESS) == 0)

		type = ACL_TYPE_ACCESS;

	else if (strcmp(name, XATTR_NAME_ACL_DEFAULT) == 0)

	else if (strcmp(name, POSIX_ACL_XATTR_DEFAULT) == 0)

		type = ACL_TYPE_DEFAULT;

	else

		return -EOPNOTSUPP;
@@ -103,9 +103,9 @@ int nfs3_removexattr(struct dentry *dentry, const char *name) 
	struct inode *inode = dentry->d_inode;

	int type;



	if (strcmp(name, XATTR_NAME_ACL_ACCESS) == 0)

	if (strcmp(name, POSIX_ACL_XATTR_ACCESS) == 0)

		type = ACL_TYPE_ACCESS;

	else if (strcmp(name, XATTR_NAME_ACL_DEFAULT) == 0)

	else if (strcmp(name, POSIX_ACL_XATTR_DEFAULT) == 0)

		type = ACL_TYPE_DEFAULT;

	else

		return -EOPNOTSUPP;

fs/nfsd/vfs.c

+6 −7
Original line number Diff line number Diff line
@@ -46,10 +46,9 @@ 
#include <linux/nfsd/nfsfh.h>

#include <linux/quotaops.h>

#include <linux/dnotify.h>

#include <linux/xattr_acl.h>

#include <linux/posix_acl.h>

#ifdef CONFIG_NFSD_V4

#include <linux/posix_acl_xattr.h>

#ifdef CONFIG_NFSD_V4

#include <linux/xattr.h>

#include <linux/nfs4.h>

#include <linux/nfs4_acl.h>
@@ -1872,10 +1871,10 @@ nfsd_get_posix_acl(struct svc_fh *fhp, int type) 
		return ERR_PTR(-EOPNOTSUPP);

	switch(type) {

		case ACL_TYPE_ACCESS:

			name = XATTR_NAME_ACL_ACCESS;

			name = POSIX_ACL_XATTR_ACCESS;

			break;

		case ACL_TYPE_DEFAULT:

			name = XATTR_NAME_ACL_DEFAULT;

			name = POSIX_ACL_XATTR_DEFAULT;

			break;

		default:

			return ERR_PTR(-EOPNOTSUPP);
@@ -1919,17 +1918,17 @@ nfsd_set_posix_acl(struct svc_fh *fhp, int type, struct posix_acl *acl) 
		return -EOPNOTSUPP;

	switch(type) {

		case ACL_TYPE_ACCESS:

			name = XATTR_NAME_ACL_ACCESS;

			name = POSIX_ACL_XATTR_ACCESS;

			break;

		case ACL_TYPE_DEFAULT:

			name = XATTR_NAME_ACL_DEFAULT;

			name = POSIX_ACL_XATTR_DEFAULT;

			break;

		default:

			return -EOPNOTSUPP;

	}



	if (acl && acl->a_count) {

		size = xattr_acl_size(acl->a_count);

		size = posix_acl_xattr_size(acl->a_count);

		value = kmalloc(size, GFP_KERNEL);

		if (!value)

			return -ENOMEM;

include/linux/xattr_acl.h

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
/*

  File: linux/xattr_acl.h



  (extended attribute representation of access control lists)



  (C) 2000 Andreas Gruenbacher, <a.gruenbacher@computer.org>

*/



#ifndef _LINUX_XATTR_ACL_H

#define _LINUX_XATTR_ACL_H



#include <linux/posix_acl.h>



#define XATTR_NAME_ACL_ACCESS	"system.posix_acl_access"

#define XATTR_NAME_ACL_DEFAULT	"system.posix_acl_default"



#define XATTR_ACL_VERSION	0x0002



typedef struct {

	__u16		e_tag;

	__u16		e_perm;

	__u32		e_id;

} xattr_acl_entry;



typedef struct {

	__u32		a_version;

	xattr_acl_entry	a_entries[0];

} xattr_acl_header;



static inline size_t xattr_acl_size(int count)

{

	return sizeof(xattr_acl_header) + count * sizeof(xattr_acl_entry);

}



static inline int xattr_acl_count(size_t size)

{

	if (size < sizeof(xattr_acl_header))

		return -1;

	size -= sizeof(xattr_acl_header);

	if (size % sizeof(xattr_acl_entry))

		return -1;

	return size / sizeof(xattr_acl_entry);

}



struct posix_acl * posix_acl_from_xattr(const void *value, size_t size);

int posix_acl_to_xattr(const struct posix_acl *acl, void *buffer, size_t size);







#endif /* _LINUX_XATTR_ACL_H */