X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fcifs%2Fxattr.c;h=dd6a2c08cd73f01ae6cfbb858217a9f387200b2d;hb=4df52aa9a6dd8cb5fff67da03cdfa58a3c607912;hp=ebc69c385d2efadbc922eb44379f5029cf54492a;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/fs/cifs/xattr.c b/fs/cifs/xattr.c
index ebc69c385..dd6a2c08c 100644
--- a/fs/cifs/xattr.c
+++ b/fs/cifs/xattr.c
@@ -26,178 +26,27 @@
 #include "cifsproto.h"
 #include "cifs_debug.h"
 
-#define MAX_EA_VALUE_SIZE 65535
-#define CIFS_XATTR_DOS_ATTRIB "user.DOSATTRIB"
-#define CIFS_XATTR_USER_PREFIX "user."
-#define CIFS_XATTR_SYSTEM_PREFIX "system."
-#define CIFS_XATTR_OS2_PREFIX "OS2." /* BB should check for this someday */
-/* also note could add check for security prefix XATTR_SECURITY_PREFIX */ 
-
-
-int cifs_removexattr(struct dentry * direntry, const char * ea_name)
+int cifs_removexattr(struct dentry * direntry, const char * name)
 {
 	int rc = -EOPNOTSUPP;
-#ifdef CONFIG_CIFS_XATTR
-	int xid;
-	struct cifs_sb_info *cifs_sb;
-	struct cifsTconInfo *pTcon;
-	struct super_block * sb;
-	char * full_path;
-                                                                                     
-	if(direntry == NULL)
-		return -EIO;
-	if(direntry->d_inode == NULL)
-		return -EIO;
-	sb = direntry->d_inode->i_sb;
-	if(sb == NULL)
-		return -EIO;
-	xid = GetXid();
-                                                                                     
-	cifs_sb = CIFS_SB(sb);
-	pTcon = cifs_sb->tcon;
-                                                                                     
-	down(&sb->s_vfs_rename_sem);
-	full_path = build_path_from_dentry(direntry);
-	up(&sb->s_vfs_rename_sem);
-	if(full_path == NULL) {
-		FreeXid(xid);
-		return -ENOMEM;
-	}
-	if(ea_name == NULL) {
-		cFYI(1,("Null xattr names not supported"));
-	} else if(strncmp(ea_name,CIFS_XATTR_USER_PREFIX,5)) {
-		cFYI(1,("illegal xattr namespace %s (only user namespace supported)",ea_name));
-		/* BB what if no namespace prefix? */
-		/* Should we just pass them to server, except for
-		system and perhaps security prefixes? */
-	} else {
-		ea_name+=5; /* skip past user. prefix */
-		rc = CIFSSMBSetEA(xid,pTcon,full_path,ea_name,NULL,
-			(__u16)0, cifs_sb->local_nls);
-	}
-	if (full_path)
-		kfree(full_path);
-	FreeXid(xid);
-#endif
 	return rc;
 }
 
-int cifs_setxattr(struct dentry * direntry, const char * ea_name,
-        const void * ea_value, size_t value_size, int flags)
+int cifs_setxattr(struct dentry * direntry, const char * name,
+        const void * value, size_t size, int flags)
 {
 	int rc = -EOPNOTSUPP;
-#ifdef CONFIG_CIFS_XATTR
-	int xid;
-	struct cifs_sb_info *cifs_sb;
-	struct cifsTconInfo *pTcon;
-	struct super_block * sb;
-	char * full_path;
-
-	if(direntry == NULL)
-		return -EIO;
-	if(direntry->d_inode == NULL)
-		return -EIO;
-	sb = direntry->d_inode->i_sb;
-	if(sb == NULL)
-		return -EIO;
-	xid = GetXid();
-
-	cifs_sb = CIFS_SB(sb);
-	pTcon = cifs_sb->tcon;
-
-	down(&sb->s_vfs_rename_sem);
-	full_path = build_path_from_dentry(direntry);
-	up(&sb->s_vfs_rename_sem);
-	if(full_path == NULL) {
-		FreeXid(xid);
-		return -ENOMEM;
-	}
-	/* return dos attributes as pseudo xattr */
-	/* return alt name if available as pseudo attr */
-
-	/* if proc/fs/cifs/streamstoxattr is set then
-		search server for EAs or streams to 
-		returns as xattrs */
-	if(value_size > MAX_EA_VALUE_SIZE) {
-		cFYI(1,("size of EA value too large"));
-		if(full_path)
-			kfree(full_path);
-		FreeXid(xid);
-		return -EOPNOTSUPP;
-	}
-
-	if(ea_name == NULL) {
-		cFYI(1,("Null xattr names not supported"));
-	} else if(strncmp(ea_name,CIFS_XATTR_USER_PREFIX,5)) {
-		cFYI(1,("illegal xattr namespace %s (only user namespace supported)",ea_name));
-		  /* BB what if no namespace prefix? */
-		  /* Should we just pass them to server, except for 
-		  system and perhaps security prefixes? */
-	} else {
-		ea_name+=5; /* skip past user. prefix */
-		rc = CIFSSMBSetEA(xid,pTcon,full_path,ea_name,ea_value,
-			(__u16)value_size, cifs_sb->local_nls);
-	}
-	if (full_path)
-		kfree(full_path);
-	FreeXid(xid);
-#endif
 	return rc;
 }
 
-ssize_t cifs_getxattr(struct dentry * direntry, const char * ea_name,
-         void * ea_value, size_t buf_size)
+ssize_t cifs_getxattr(struct dentry * direntry, const char * name,
+         void * value, size_t size)
 {
 	ssize_t rc = -EOPNOTSUPP;
-#ifdef CONFIG_CIFS_XATTR
-	int xid;
-	struct cifs_sb_info *cifs_sb;
-	struct cifsTconInfo *pTcon;
-	struct super_block * sb;
-	char * full_path;
-
-	if(direntry == NULL)
-		return -EIO;
-	if(direntry->d_inode == NULL)
-		return -EIO;
-	sb = direntry->d_inode->i_sb;
-	if(sb == NULL)
-		return -EIO;
-	xid = GetXid();
-
-	cifs_sb = CIFS_SB(sb);
-	pTcon = cifs_sb->tcon;
-
-	down(&sb->s_vfs_rename_sem);
-	full_path = build_path_from_dentry(direntry);
-	up(&sb->s_vfs_rename_sem);
-	if(full_path == NULL) {
-		FreeXid(xid);
-		return -ENOMEM;
-	}
-	/* return dos attributes as pseudo xattr */
-	/* return alt name if available as pseudo attr */
-	if(strncmp(ea_name,CIFS_XATTR_USER_PREFIX,5)) {
-		cFYI(1,("illegal xattr namespace %s (only user namespace supported)",ea_name));
-		/* BB what if no namespace prefix? */
-		/* Should we just pass them to server, except for system? */
-	} else {
-	/* We could add a check here
-	    if proc/fs/cifs/streamstoxattr is set then
-		search server for EAs or streams to 
-		returns as xattrs */
-		ea_name+=5; /* skip past user. */
-		rc = CIFSSMBQueryEA(xid,pTcon,full_path,ea_name,ea_value,
-				buf_size, cifs_sb->local_nls);
-	}
-	if (full_path)
-		kfree(full_path);
-	FreeXid(xid);
-#endif
 	return rc;
 }
 
-ssize_t cifs_listxattr(struct dentry * direntry, char * data, size_t buf_size)
+ssize_t cifs_listxattr(struct dentry * direntry, char * ea_data, size_t ea_size)
 {
 	ssize_t rc = -EOPNOTSUPP;
 #ifdef CONFIG_CIFS_XATTR
@@ -206,7 +55,6 @@ ssize_t cifs_listxattr(struct dentry * direntry, char * data, size_t buf_size)
 	struct cifsTconInfo *pTcon;
 	struct super_block * sb;
 	char * full_path;
-
 	if(direntry == NULL)
 		return -EIO;
 	if(direntry->d_inode == NULL)
@@ -226,17 +74,13 @@ ssize_t cifs_listxattr(struct dentry * direntry, char * data, size_t buf_size)
 		FreeXid(xid);
 		return -ENOMEM;
 	}
-	/* return dos attributes as pseudo xattr */
+	/* return dosattributes as pseudo xattr */
 	/* return alt name if available as pseudo attr */
 
 	/* if proc/fs/cifs/streamstoxattr is set then
 		search server for EAs or streams to 
 		returns as xattrs */
-	rc = CIFSSMBQAllEAs(xid,pTcon,full_path,data,buf_size,
-				cifs_sb->local_nls);
-
-	if (full_path)
-		kfree(full_path);
+	rc = CIFSSMBQAllEAs(xid,pTcon,full_path,ea_data,ea_size,cifs_sb->local_nls);
 	FreeXid(xid);
 #endif
 	return rc;