Author: sfrench Date: 2006-08-17 21:47:38 +0000 (Thu, 17 Aug 2006) New Revision: 73
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=linux-cifs-client&rev=73 Log: Merge cifs with git tree Modified: branches/linux-converged-for-old-kernels/fs/cifs/CHANGES branches/linux-converged-for-old-kernels/fs/cifs/README branches/linux-converged-for-old-kernels/fs/cifs/xattr.c Changeset: Modified: branches/linux-converged-for-old-kernels/fs/cifs/CHANGES =================================================================== --- branches/linux-converged-for-old-kernels/fs/cifs/CHANGES 2006-08-16 19:51:48 UTC (rev 72) +++ branches/linux-converged-for-old-kernels/fs/cifs/CHANGES 2006-08-17 21:47:38 UTC (rev 73) @@ -5,7 +5,8 @@ on requests on other threads. Improve POSIX locking emulation, (lock cancel now works, and unlock of merged range works even to Windows servers now). Fix oops on mount to lanman servers -(win9x, os/2 etc.) when null password. +(win9x, os/2 etc.) when null password. Do not send listxattr +(SMB to query all EAs) if nouser_xattr specified. Version 1.44 ------------ Modified: branches/linux-converged-for-old-kernels/fs/cifs/README =================================================================== --- branches/linux-converged-for-old-kernels/fs/cifs/README 2006-08-16 19:51:48 UTC (rev 72) +++ branches/linux-converged-for-old-kernels/fs/cifs/README 2006-08-17 21:47:38 UTC (rev 73) @@ -408,7 +408,7 @@ user_xattr Allow getting and setting user xattrs as OS/2 EAs (extended attributes) to the server (default) e.g. via setfattr and getfattr utilities. - nouser_xattr Do not allow getfattr/setfattr to get/set xattrs + nouser_xattr Do not allow getfattr/setfattr to get/set/list xattrs mapchars Translate six of the seven reserved characters (not backslash) *?<>|: to the remap range (above 0xF000), which also Modified: branches/linux-converged-for-old-kernels/fs/cifs/xattr.c =================================================================== --- branches/linux-converged-for-old-kernels/fs/cifs/xattr.c 2006-08-16 19:51:48 UTC (rev 72) +++ branches/linux-converged-for-old-kernels/fs/cifs/xattr.c 2006-08-17 21:47:38 UTC (rev 73) @@ -330,11 +330,15 @@ sb = direntry->d_inode->i_sb; if(sb == NULL) return -EIO; - xid = GetXid(); cifs_sb = CIFS_SB(sb); pTcon = cifs_sb->tcon; + if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_XATTR) + return -EOPNOTSUPP; + + xid = GetXid(); + full_path = build_path_from_dentry(direntry); if(full_path == NULL) { FreeXid(xid);
