Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / fs / cifs / xattr.c

diff --git a/fs/cifs/xattr.c b/fs/cifs/xattr.c
index 22f909e..7754d64 100644 (file)
--- a/fs/cifs/xattr.c
+++ b/fs/cifs/xattr.c
@@ -62,27 +62,30 @@ int cifs_removexattr(struct dentry * direntry, const char * ea_name)
        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)) {
+       } else if(strncmp(ea_name,CIFS_XATTR_USER_PREFIX,5)
+               && (strncmp(ea_name,CIFS_XATTR_OS2_PREFIX,4))) {
                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 {
+               if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_XATTR)
+                       goto remove_ea_exit;
+
                ea_name+=5; /* skip past user. prefix */
                rc = CIFSSMBSetEA(xid,pTcon,full_path,ea_name,NULL,
-                       (__u16)0, cifs_sb->local_nls);
+                       (__u16)0, cifs_sb->local_nls,
+                       cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
        }
-       if (full_path)
-               kfree(full_path);
+remove_ea_exit:
+       kfree(full_path);
        FreeXid(xid);
 #endif
        return rc;
@@ -111,9 +114,7 @@ int cifs_setxattr(struct dentry * direntry, const char * ea_name,
        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;
@@ -126,8 +127,7 @@ int cifs_setxattr(struct dentry * direntry, const char * ea_name,
                returns as xattrs */
        if(value_size > MAX_EA_VALUE_SIZE) {
                cFYI(1,("size of EA value too large"));
-               if(full_path)
-                       kfree(full_path);
+               kfree(full_path);
                FreeXid(xid);
                return -EOPNOTSUPP;
        }
@@ -135,34 +135,47 @@ int cifs_setxattr(struct dentry * direntry, const char * ea_name,
        if(ea_name == NULL) {
                cFYI(1,("Null xattr names not supported"));
        } else if(strncmp(ea_name,CIFS_XATTR_USER_PREFIX,5) == 0) {
+               if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_XATTR)
+                       goto set_ea_exit;
                if(strncmp(ea_name,CIFS_XATTR_DOS_ATTRIB,14) == 0) {
                        cFYI(1,("attempt to set cifs inode metadata"));
                }
                ea_name += 5; /* skip past user. prefix */
                rc = CIFSSMBSetEA(xid,pTcon,full_path,ea_name,ea_value,
-                       (__u16)value_size, cifs_sb->local_nls);
+                       (__u16)value_size, cifs_sb->local_nls,
+                       cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
        } else if(strncmp(ea_name, CIFS_XATTR_OS2_PREFIX,4) == 0) {
+               if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_XATTR)
+                       goto set_ea_exit;
+
                ea_name += 4; /* skip past os2. prefix */
                rc = CIFSSMBSetEA(xid,pTcon,full_path,ea_name,ea_value,
-                       (__u16)value_size, cifs_sb->local_nls);
+                       (__u16)value_size, cifs_sb->local_nls,
+                       cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
        } else {
                int temp; 
                temp = strncmp(ea_name,POSIX_ACL_XATTR_ACCESS,
                        strlen(POSIX_ACL_XATTR_ACCESS));
                if (temp == 0) {
 #ifdef CONFIG_CIFS_POSIX
-                       rc = CIFSSMBSetPosixACL(xid, pTcon,full_path,ea_value,
-                               (const int)value_size, ACL_TYPE_ACCESS,
-                               cifs_sb->local_nls);
+                       if(sb->s_flags & MS_POSIXACL)
+                               rc = CIFSSMBSetPosixACL(xid, pTcon,full_path,
+                                       ea_value, (const int)value_size, 
+                                       ACL_TYPE_ACCESS,cifs_sb->local_nls,
+                                       cifs_sb->mnt_cifs_flags & 
+                                               CIFS_MOUNT_MAP_SPECIAL_CHR);
                        cFYI(1,("set POSIX ACL rc %d",rc));
 #else
                        cFYI(1,("set POSIX ACL not supported"));
 #endif
                } else if(strncmp(ea_name,POSIX_ACL_XATTR_DEFAULT,strlen(POSIX_ACL_XATTR_DEFAULT)) == 0) {
 #ifdef CONFIG_CIFS_POSIX
-                       rc = CIFSSMBSetPosixACL(xid, pTcon,full_path,ea_value,
-                               (const int)value_size, ACL_TYPE_DEFAULT,
-                               cifs_sb->local_nls);
+                       if(sb->s_flags & MS_POSIXACL)
+                               rc = CIFSSMBSetPosixACL(xid, pTcon,full_path,
+                                       ea_value, (const int)value_size, 
+                                       ACL_TYPE_DEFAULT, cifs_sb->local_nls,
+                                       cifs_sb->mnt_cifs_flags & 
+                                               CIFS_MOUNT_MAP_SPECIAL_CHR);
                        cFYI(1,("set POSIX default ACL rc %d",rc));
 #else
                        cFYI(1,("set default POSIX ACL not supported"));
@@ -174,9 +187,9 @@ int cifs_setxattr(struct dentry * direntry, const char * ea_name,
                  system and perhaps security prefixes? */
                }
        }
- 
-       if (full_path)
-               kfree(full_path);
+
+set_ea_exit:
+       kfree(full_path);
        FreeXid(xid);
 #endif
        return rc;
@@ -206,9 +219,7 @@ ssize_t cifs_getxattr(struct dentry * direntry, const char * ea_name,
        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;
@@ -218,30 +229,62 @@ ssize_t cifs_getxattr(struct dentry * direntry, const char * ea_name,
        if(ea_name == NULL) {
                cFYI(1,("Null xattr names not supported"));
        } else if(strncmp(ea_name,CIFS_XATTR_USER_PREFIX,5) == 0) {
+               if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_XATTR)
+                       goto get_ea_exit;
+
                if(strncmp(ea_name,CIFS_XATTR_DOS_ATTRIB,14) == 0) {
                        cFYI(1,("attempt to query cifs inode metadata"));
                        /* revalidate/getattr then populate from inode */
                } /* BB add else when above is implemented */
                ea_name += 5; /* skip past user. prefix */
                rc = CIFSSMBQueryEA(xid,pTcon,full_path,ea_name,ea_value,
-                       buf_size, cifs_sb->local_nls);
+                       buf_size, cifs_sb->local_nls,
+                       cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
        } else if(strncmp(ea_name, CIFS_XATTR_OS2_PREFIX,4) == 0) {
+               if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_XATTR)
+                       goto get_ea_exit;
+
                ea_name += 4; /* skip past os2. prefix */
                rc = CIFSSMBQueryEA(xid,pTcon,full_path,ea_name,ea_value,
-                       buf_size, cifs_sb->local_nls);
-       } else if(strncmp(ea_name,POSIX_ACL_XATTR_ACCESS,strlen(POSIX_ACL_XATTR_ACCESS)) == 0) {
+                       buf_size, cifs_sb->local_nls,
+                       cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
+       } else if(strncmp(ea_name,POSIX_ACL_XATTR_ACCESS,
+                         strlen(POSIX_ACL_XATTR_ACCESS)) == 0) {
 #ifdef CONFIG_CIFS_POSIX
-               rc = CIFSSMBGetPosixACL(xid, pTcon, full_path,
+               if(sb->s_flags & MS_POSIXACL)
+                       rc = CIFSSMBGetPosixACL(xid, pTcon, full_path,
                                ea_value, buf_size, ACL_TYPE_ACCESS, 
-                               cifs_sb->local_nls);
+                               cifs_sb->local_nls,
+                               cifs_sb->mnt_cifs_flags & 
+                                       CIFS_MOUNT_MAP_SPECIAL_CHR);
+/*             else if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) {
+                       __u16 fid;
+                       int oplock = FALSE;
+                       rc = CIFSSMBOpen(xid, pTcon, full_path,
+                                        FILE_OPEN, GENERIC_READ, 0, &fid,
+                                        &oplock, NULL, cifs_sb->local_nls,
+                                        cifs_sb->mnt_cifs_flags &
+                                        CIFS_MOUNT_MAP_SPECIAL_CHR);
+                       if(rc == 0) {
+                               rc = CIFSSMBGetCIFSACL(xid, pTcon, fid,
+                                       ea_value, buf_size,
+                                       ACL_TYPE_ACCESS);
+                               CIFSSMBClose(xid, pTcon, fid)
+                       }
+               } */  /* BB enable after fixing up return data */
+                               
 #else 
                cFYI(1,("query POSIX ACL not supported yet"));
 #endif /* CONFIG_CIFS_POSIX */
-       } else if(strncmp(ea_name,POSIX_ACL_XATTR_DEFAULT,strlen(POSIX_ACL_XATTR_DEFAULT)) == 0) {
+       } else if(strncmp(ea_name,POSIX_ACL_XATTR_DEFAULT,
+                         strlen(POSIX_ACL_XATTR_DEFAULT)) == 0) {
 #ifdef CONFIG_CIFS_POSIX
-               rc = CIFSSMBGetPosixACL(xid, pTcon, full_path,
+               if(sb->s_flags & MS_POSIXACL)
+                       rc = CIFSSMBGetPosixACL(xid, pTcon, full_path,
                                ea_value, buf_size, ACL_TYPE_DEFAULT, 
-                               cifs_sb->local_nls);
+                               cifs_sb->local_nls,
+                               cifs_sb->mnt_cifs_flags & 
+                                       CIFS_MOUNT_MAP_SPECIAL_CHR);
 #else 
                cFYI(1,("query POSIX default ACL not supported yet"));
 #endif
@@ -263,8 +306,8 @@ ssize_t cifs_getxattr(struct dentry * direntry, const char * ea_name,
        if(rc == -EINVAL)
                rc = -EOPNOTSUPP; 
 
-       if (full_path)
-               kfree(full_path);
+get_ea_exit:
+       kfree(full_path);
        FreeXid(xid);
 #endif
        return rc;
@@ -292,9 +335,7 @@ ssize_t cifs_listxattr(struct dentry * direntry, char * data, size_t buf_size)
        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;
@@ -306,10 +347,11 @@ ssize_t cifs_listxattr(struct dentry * direntry, char * data, size_t buf_size)
                search server for EAs or streams to 
                returns as xattrs */
        rc = CIFSSMBQAllEAs(xid,pTcon,full_path,data,buf_size,
-                               cifs_sb->local_nls);
+                               cifs_sb->local_nls,
+                               cifs_sb->mnt_cifs_flags & 
+                                       CIFS_MOUNT_MAP_SPECIAL_CHR);
 
-       if (full_path)
-               kfree(full_path);
+       kfree(full_path);
        FreeXid(xid);
 #endif
        return rc;