Commit c2cc49a2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  cifs: when ATTR_READONLY is set, only clear write bits on non-directories
  cifs: remove cifsInodeInfo->inUse counter
  cifs: convert cifs_get_inode_info and non-posix readdir to use cifs_iget
  [CIFS] update cifs version number
  cifs: add and use CIFSSMBUnixSetFileInfo for setattr calls
  cifs: make a separate function for filling out FILE_UNIX_BASIC_INFO
  cifs: rename CIFSSMBUnixSetInfo to CIFSSMBUnixSetPathInfo
  cifs: add pid of initiating process to spnego upcall info
  cifs: fix regression with O_EXCL creates and optimize away lookup
  cifs: add new cifs_iget function and convert unix codepath to use it
parents e864561c d0c280d2

fs/cifs/CHANGES

+5 −1
Original line number Diff line number Diff line
@@ -5,7 +5,11 @@ client generated ones by default (mount option "serverino" turned 
on by default if server supports it).  Add forceuid and forcegid

mount options (so that when negotiating unix extensions specifying

which uid mounted does not immediately force the server's reported

uids to be overridden).  Add support for scope moutn parm.

uids to be overridden).  Add support for scope mount parm. Improve

hard link detection to use same inode for both.  Do not set

read-only dos attribute on directories (for chmod) since Windows

explorer special cases this attribute bit for directories for

a different purpose.



Version 1.58

------------

fs/cifs/cifs_spnego.c

+8 −1
Original line number Diff line number Diff line
@@ -86,6 +86,9 @@ struct key_type cifs_spnego_key_type = { 
/* strlen of ";user=" */

#define USER_KEY_LEN		6



/* strlen of ";pid=0x" */

#define PID_KEY_LEN		7



/* get a key struct with a SPNEGO security blob, suitable for session setup */

struct key *

cifs_get_spnego_key(struct cifsSesInfo *sesInfo)
@@ -103,7 +106,8 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo) 
		   IP_KEY_LEN + INET6_ADDRSTRLEN +

		   MAX_MECH_STR_LEN +

		   UID_KEY_LEN + (sizeof(uid_t) * 2) +

		   USER_KEY_LEN + strlen(sesInfo->userName) + 1;

		   USER_KEY_LEN + strlen(sesInfo->userName) +

		   PID_KEY_LEN + (sizeof(pid_t) * 2) + 1;



	spnego_key = ERR_PTR(-ENOMEM);

	description = kzalloc(desc_len, GFP_KERNEL);
@@ -141,6 +145,9 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo) 
	dp = description + strlen(description);

	sprintf(dp, ";user=%s", sesInfo->userName);



	dp = description + strlen(description);

	sprintf(dp, ";pid=0x%x", current->pid);



	cFYI(1, ("key description = %s", description));

	spnego_key = request_key(&cifs_spnego_key_type, description, "");

fs/cifs/cifsacl.c

+13 −13
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ static void dump_ace(struct cifs_ace *pace, char *end_of_acl) 


static void parse_dacl(struct cifs_acl *pdacl, char *end_of_acl,

		       struct cifs_sid *pownersid, struct cifs_sid *pgrpsid,

		       struct inode *inode)

		       struct cifs_fattr *fattr)

{

	int i;

	int num_aces = 0;
@@ -340,7 +340,7 @@ static void parse_dacl(struct cifs_acl *pdacl, char *end_of_acl, 
	if (!pdacl) {

		/* no DACL in the security descriptor, set

		   all the permissions for user/group/other */

		inode->i_mode |= S_IRWXUGO;

		fattr->cf_mode |= S_IRWXUGO;

		return;

	}
@@ -357,7 +357,7 @@ static void parse_dacl(struct cifs_acl *pdacl, char *end_of_acl, 
	/* reset rwx permissions for user/group/other.

	   Also, if num_aces is 0 i.e. DACL has no ACEs,

	   user/group/other have no permissions */

	inode->i_mode &= ~(S_IRWXUGO);

	fattr->cf_mode &= ~(S_IRWXUGO);



	acl_base = (char *)pdacl;

	acl_size = sizeof(struct cifs_acl);
@@ -379,17 +379,17 @@ static void parse_dacl(struct cifs_acl *pdacl, char *end_of_acl, 
			if (compare_sids(&(ppace[i]->sid), pownersid))

				access_flags_to_mode(ppace[i]->access_req,

						     ppace[i]->type,

						     &(inode->i_mode),

						     &fattr->cf_mode,

						     &user_mask);

			if (compare_sids(&(ppace[i]->sid), pgrpsid))

				access_flags_to_mode(ppace[i]->access_req,

						     ppace[i]->type,

						     &(inode->i_mode),

						     &fattr->cf_mode,

						     &group_mask);

			if (compare_sids(&(ppace[i]->sid), &sid_everyone))

				access_flags_to_mode(ppace[i]->access_req,

						     ppace[i]->type,

						     &(inode->i_mode),

						     &fattr->cf_mode,

						     &other_mask);



/*			memcpy((void *)(&(cifscred->aces[i])),
@@ -464,7 +464,7 @@ static int parse_sid(struct cifs_sid *psid, char *end_of_acl) 


/* Convert CIFS ACL to POSIX form */

static int parse_sec_desc(struct cifs_ntsd *pntsd, int acl_len,

			  struct inode *inode)

			  struct cifs_fattr *fattr)

{

	int rc;

	struct cifs_sid *owner_sid_ptr, *group_sid_ptr;
@@ -472,7 +472,7 @@ static int parse_sec_desc(struct cifs_ntsd *pntsd, int acl_len, 
	char *end_of_acl = ((char *)pntsd) + acl_len;

	__u32 dacloffset;



	if ((inode == NULL) || (pntsd == NULL))

	if (pntsd == NULL)

		return -EIO;



	owner_sid_ptr = (struct cifs_sid *)((char *)pntsd +
@@ -497,7 +497,7 @@ static int parse_sec_desc(struct cifs_ntsd *pntsd, int acl_len, 


	if (dacloffset)

		parse_dacl(dacl_ptr, end_of_acl, owner_sid_ptr,

			   group_sid_ptr, inode);

			   group_sid_ptr, fattr);

	else

		cFYI(1, ("no ACL")); /* BB grant all or default perms? */
@@ -508,7 +508,6 @@ static int parse_sec_desc(struct cifs_ntsd *pntsd, int acl_len, 
	memcpy((void *)(&(cifscred->gsid)), (void *)group_sid_ptr,

			sizeof(struct cifs_sid)); */





	return 0;

}
@@ -671,8 +670,9 @@ static int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen, 
}



/* Translate the CIFS ACL (simlar to NTFS ACL) for a file into mode bits */

void acl_to_uid_mode(struct cifs_sb_info *cifs_sb, struct inode *inode,

		     const char *path, const __u16 *pfid)

void

cifs_acl_to_fattr(struct cifs_sb_info *cifs_sb, struct cifs_fattr *fattr,

		  struct inode *inode, const char *path, const __u16 *pfid)

{

	struct cifs_ntsd *pntsd = NULL;

	u32 acllen = 0;
@@ -687,7 +687,7 @@ void acl_to_uid_mode(struct cifs_sb_info *cifs_sb, struct inode *inode, 


	/* if we can retrieve the ACL, now parse Access Control Entries, ACEs */

	if (pntsd)

		rc = parse_sec_desc(pntsd, acllen, inode);

		rc = parse_sec_desc(pntsd, acllen, fattr);

	if (rc)

		cFYI(1, ("parse sec desc failed rc = %d", rc));

fs/cifs/cifsfs.c

+0 −1
Original line number Diff line number Diff line
@@ -308,7 +308,6 @@ cifs_alloc_inode(struct super_block *sb) 
	if (!cifs_inode)

		return NULL;

	cifs_inode->cifsAttrs = 0x20;	/* default */

	atomic_set(&cifs_inode->inUse, 0);

	cifs_inode->time = 0;

	cifs_inode->write_behind_rc = 0;

	/* Until the file is open and we have gotten oplock

fs/cifs/cifsfs.h

+14 −1
Original line number Diff line number Diff line
@@ -24,6 +24,19 @@ 


#define ROOT_I 2



/*

 * ino_t is 32-bits on 32-bit arch. We have to squash the 64-bit value down

 * so that it will fit.

 */

static inline ino_t

cifs_uniqueid_to_ino_t(u64 fileid)

{

	ino_t ino = (ino_t) fileid;

	if (sizeof(ino_t) < sizeof(u64))

		ino ^= fileid >> (sizeof(u64)-sizeof(ino_t)) * 8;

	return ino;

}



extern struct file_system_type cifs_fs_type;

extern const struct address_space_operations cifs_addr_ops;

extern const struct address_space_operations cifs_addr_ops_smallbuf;
@@ -100,5 +113,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); 
extern const struct export_operations cifs_export_ops;

#endif /* EXPERIMENTAL */



#define CIFS_VERSION   "1.59"

#define CIFS_VERSION   "1.60"

#endif				/* _CIFSFS_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE