Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (0d995b2b) · Commits · 戴 / test

fs/cifs/cifs_dfs_ref.c

+9 −9

Original line number	Original line	Diff line number	Diff line
	@@ -74,7 +74,7 @@ static char cifs_get_share_name(const char node_name)
	pSep = memchr(UNC+2, '\\', len-2);		pSep = memchr(UNC+2, '\\', len-2);
	if (!pSep) {		if (!pSep) {
	cERROR(1, ("%s: no server name end in node name: %s",		cERROR(1, ("%s: no server name end in node name: %s",
	__FUNCTION__, node_name));		__func__, node_name));
	kfree(UNC);		kfree(UNC);
	return NULL;		return NULL;
	}		}
	@@ -84,7 +84,7 @@ static char cifs_get_share_name(const char node_name)
	pSep = memchr(UNC+(pSep-UNC), '\\', len-(pSep-UNC));		pSep = memchr(UNC+(pSep-UNC), '\\', len-(pSep-UNC));
	if (!pSep) {		if (!pSep) {
	cERROR(1, ("%s:2 cant find share name in node name: %s",		cERROR(1, ("%s:2 cant find share name in node name: %s",
	__FUNCTION__, node_name));		__func__, node_name));
	kfree(UNC);		kfree(UNC);
	return NULL;		return NULL;
	}		}
	@@ -127,7 +127,7 @@ static char compose_mount_options(const char sb_mountdata,
	rc = dns_resolve_server_name_to_ip(*devname, &srvIP);		rc = dns_resolve_server_name_to_ip(*devname, &srvIP);
	if (rc != 0) {		if (rc != 0) {
	cERROR(1, ("%s: Failed to resolve server part of %s to IP",		cERROR(1, ("%s: Failed to resolve server part of %s to IP",
	__FUNCTION__, *devname));		__func__, *devname));
	mountdata = ERR_PTR(rc);		mountdata = ERR_PTR(rc);
	goto compose_mount_options_out;		goto compose_mount_options_out;
	}		}
	@@ -181,8 +181,8 @@ static char compose_mount_options(const char sb_mountdata,
	}		}
	}		}

	/cFYI(1,("%s: parent mountdata: %s", __FUNCTION__,sb_mountdata));/		/cFYI(1,("%s: parent mountdata: %s", __func__,sb_mountdata));/
	/cFYI(1, ("%s: submount mountdata: %s", __FUNCTION__, mountdata ));/		/cFYI(1, ("%s: submount mountdata: %s", __func__, mountdata ));/

	compose_mount_options_out:		compose_mount_options_out:
	kfree(srvIP);		kfree(srvIP);
	@@ -302,7 +302,7 @@ cifs_dfs_follow_mountpoint(struct dentry dentry, struct nameidata nd)
	int rc = 0;		int rc = 0;
	struct vfsmount *mnt = ERR_PTR(-ENOENT);		struct vfsmount *mnt = ERR_PTR(-ENOENT);

	cFYI(1, ("in %s", __FUNCTION__));		cFYI(1, ("in %s", __func__));
	BUG_ON(IS_ROOT(dentry));		BUG_ON(IS_ROOT(dentry));

	xid = GetXid();		xid = GetXid();
	@@ -336,7 +336,7 @@ cifs_dfs_follow_mountpoint(struct dentry dentry, struct nameidata nd)
	len = strlen(referrals[i].node_name);		len = strlen(referrals[i].node_name);
	if (len < 2) {		if (len < 2) {
	cERROR(1, ("%s: Net Address path too short: %s",		cERROR(1, ("%s: Net Address path too short: %s",
	__FUNCTION__, referrals[i].node_name));		__func__, referrals[i].node_name));
	rc = -EINVAL;		rc = -EINVAL;
	goto out_err;		goto out_err;
	}		}
	@@ -344,7 +344,7 @@ cifs_dfs_follow_mountpoint(struct dentry dentry, struct nameidata nd)
	nd->path.dentry,		nd->path.dentry,
	referrals[i].node_name);		referrals[i].node_name);
	cFYI(1, ("%s: cifs_dfs_do_refmount:%s , mnt:%p",		cFYI(1, ("%s: cifs_dfs_do_refmount:%s , mnt:%p",
	__FUNCTION__,		__func__,
	referrals[i].node_name, mnt));		referrals[i].node_name, mnt));

	/* complete mount procedure if we accured submount */		/* complete mount procedure if we accured submount */
	@@ -365,7 +365,7 @@ out:
	FreeXid(xid);		FreeXid(xid);
	free_dfs_info_array(referrals, num_referrals);		free_dfs_info_array(referrals, num_referrals);
	kfree(full_path);		kfree(full_path);
	cFYI(1, ("leaving %s" , __FUNCTION__));		cFYI(1, ("leaving %s" , __func__));
	return ERR_PTR(rc);		return ERR_PTR(rc);
	out_err:		out_err:
	path_put(&nd->path);		path_put(&nd->path);

fs/cifs/cifsacl.c

+15 −10

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* fs/cifs/cifsacl.c		* fs/cifs/cifsacl.c
	*		*
	* Copyright (C) International Business Machines Corp., 2007		* Copyright (C) International Business Machines Corp., 2007,2008
	* Author(s): Steve French (sfrench@us.ibm.com)		* Author(s): Steve French (sfrench@us.ibm.com)
	*		*
	* Contains the routines for mapping CIFS/NTFS ACLs		* Contains the routines for mapping CIFS/NTFS ACLs
	@@ -556,9 +556,9 @@ static int build_sec_desc(struct cifs_ntsd pntsd, struct cifs_ntsd pnntsd,

	/* Retrieve an ACL from the server */		/* Retrieve an ACL from the server */
	static struct cifs_ntsd get_cifs_acl(u32 pacllen, struct inode *inode,		static struct cifs_ntsd get_cifs_acl(u32 pacllen, struct inode *inode,
	const char *path)		const char path, const __u16 pfid)
	{		{
	struct cifsFileInfo *open_file;		struct cifsFileInfo *open_file = NULL;
	int unlock_file = FALSE;		int unlock_file = FALSE;
	int xid;		int xid;
	int rc = -EIO;		int rc = -EIO;
	@@ -573,7 +573,11 @@ static struct cifs_ntsd get_cifs_acl(u32 pacllen, struct inode *inode,
	return NULL;		return NULL;

	xid = GetXid();		xid = GetXid();
			if (pfid == NULL)
	open_file = find_readable_file(CIFS_I(inode));		open_file = find_readable_file(CIFS_I(inode));
			else
			fid = *pfid;

	sb = inode->i_sb;		sb = inode->i_sb;
	if (sb == NULL) {		if (sb == NULL) {
	FreeXid(xid);		FreeXid(xid);
	@@ -584,7 +588,7 @@ static struct cifs_ntsd get_cifs_acl(u32 pacllen, struct inode *inode,
	if (open_file) {		if (open_file) {
	unlock_file = TRUE;		unlock_file = TRUE;
	fid = open_file->netfid;		fid = open_file->netfid;
	} else {		} else if (pfid == NULL) {
	int oplock = FALSE;		int oplock = FALSE;
	/* open file */		/* open file */
	rc = CIFSSMBOpen(xid, cifs_sb->tcon, path, FILE_OPEN,		rc = CIFSSMBOpen(xid, cifs_sb->tcon, path, FILE_OPEN,
	@@ -600,10 +604,11 @@ static struct cifs_ntsd get_cifs_acl(u32 pacllen, struct inode *inode,

	rc = CIFSSMBGetCIFSACL(xid, cifs_sb->tcon, fid, &pntsd, pacllen);		rc = CIFSSMBGetCIFSACL(xid, cifs_sb->tcon, fid, &pntsd, pacllen);
	cFYI(1, ("GetCIFSACL rc = %d ACL len %d", rc, *pacllen));		cFYI(1, ("GetCIFSACL rc = %d ACL len %d", rc, *pacllen));
	if (unlock_file == TRUE)		if (unlock_file == TRUE) /* find_readable_file increments ref count */
	atomic_dec(&open_file->wrtPending);		atomic_dec(&open_file->wrtPending);
	else		else if (pfid == NULL) /* if opened above we have to close the handle */
	CIFSSMBClose(xid, cifs_sb->tcon, fid);		CIFSSMBClose(xid, cifs_sb->tcon, fid);
			/* else handle was passed in by caller */

	FreeXid(xid);		FreeXid(xid);
	return pntsd;		return pntsd;
	@@ -664,14 +669,14 @@ 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 */		/* Translate the CIFS ACL (simlar to NTFS ACL) for a file into mode bits */
	void acl_to_uid_mode(struct inode inode, const char path)		void acl_to_uid_mode(struct inode inode, const char path, const __u16 *pfid)
	{		{
	struct cifs_ntsd *pntsd = NULL;		struct cifs_ntsd *pntsd = NULL;
	u32 acllen = 0;		u32 acllen = 0;
	int rc = 0;		int rc = 0;

	cFYI(DBG2, ("converting ACL to mode for %s", path));		cFYI(DBG2, ("converting ACL to mode for %s", path));
	pntsd = get_cifs_acl(&acllen, inode, path);		pntsd = get_cifs_acl(&acllen, inode, path, pfid);

	/* if we can retrieve the ACL, now parse Access Control Entries, ACEs */		/* if we can retrieve the ACL, now parse Access Control Entries, ACEs */
	if (pntsd)		if (pntsd)
	@@ -694,7 +699,7 @@ int mode_to_acl(struct inode inode, const char path, __u64 nmode)
	cFYI(DBG2, ("set ACL from mode for %s", path));		cFYI(DBG2, ("set ACL from mode for %s", path));

	/* Get the security descriptor */		/* Get the security descriptor */
	pntsd = get_cifs_acl(&acllen, inode, path);		pntsd = get_cifs_acl(&acllen, inode, path, NULL);

	/* Add three ACEs for owner, group, everyone getting rid of		/* Add three ACEs for owner, group, everyone getting rid of
	other ACEs as chmod disables ACEs and set the security descriptor */		other ACEs as chmod disables ACEs and set the security descriptor */

fs/cifs/cifsproto.h

+5 −4

fs/cifs/dir.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -229,7 +229,8 @@ cifs_create(struct inode inode, struct dentry direntry, int mode,
	inode->i_sb, xid);		inode->i_sb, xid);
	else {		else {
	rc = cifs_get_inode_info(&newinode, full_path,		rc = cifs_get_inode_info(&newinode, full_path,
	buf, inode->i_sb, xid);		buf, inode->i_sb, xid,
			&fileHandle);
	if (newinode) {		if (newinode) {
	newinode->i_mode = mode;		newinode->i_mode = mode;
	if ((oplock & CIFS_CREATE_ACTION) &&		if ((oplock & CIFS_CREATE_ACTION) &&
	@@ -483,7 +484,7 @@ cifs_lookup(struct inode parent_dir_inode, struct dentry direntry,
	parent_dir_inode->i_sb, xid);		parent_dir_inode->i_sb, xid);
	else		else
	rc = cifs_get_inode_info(&newInode, full_path, NULL,		rc = cifs_get_inode_info(&newInode, full_path, NULL,
	parent_dir_inode->i_sb, xid);		parent_dir_inode->i_sb, xid, NULL);

	if ((rc == 0) && (newInode != NULL)) {		if ((rc == 0) && (newInode != NULL)) {
	if (pTcon->nocase)		if (pTcon->nocase)

fs/cifs/dns_resolve.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -77,14 +77,14 @@ dns_resolve_server_name_to_ip(const char unc, char *ip_addr)
	/* search for server name delimiter */		/* search for server name delimiter */
	len = strlen(unc);		len = strlen(unc);
	if (len < 3) {		if (len < 3) {
	cFYI(1, ("%s: unc is too short: %s", __FUNCTION__, unc));		cFYI(1, ("%s: unc is too short: %s", __func__, unc));
	return -EINVAL;		return -EINVAL;
	}		}
	len -= 2;		len -= 2;
	name = memchr(unc+2, '\\', len);		name = memchr(unc+2, '\\', len);
	if (!name) {		if (!name) {
	cFYI(1, ("%s: probably server name is whole unc: %s",		cFYI(1, ("%s: probably server name is whole unc: %s",
	__FUNCTION__, unc));		__func__, unc));
	} else {		} else {
	len = (name - unc) - 2/* leading // */;		len = (name - unc) - 2/* leading // */;
	}		}
	@@ -104,7 +104,7 @@ dns_resolve_server_name_to_ip(const char unc, char *ip_addr)
	if (*ip_addr) {		if (*ip_addr) {
	memcpy(*ip_addr, rkey->payload.data, len);		memcpy(*ip_addr, rkey->payload.data, len);
	(*ip_addr)[len] = '\0';		(*ip_addr)[len] = '\0';
	cFYI(1, ("%s: resolved: %s to %s", __FUNCTION__,		cFYI(1, ("%s: resolved: %s to %s", __func__,
	rkey->description,		rkey->description,
	*ip_addr		*ip_addr
	));		));
	@@ -114,7 +114,7 @@ dns_resolve_server_name_to_ip(const char unc, char *ip_addr)
	}		}
	key_put(rkey);		key_put(rkey);
	} else {		} else {
	cERROR(1, ("%s: unable to resolve: %s", __FUNCTION__, name));		cERROR(1, ("%s: unable to resolve: %s", __func__, name));
	}		}

	kfree(name);		kfree(name);

Original line number	Original line	Diff line number	Diff line
	@@ -39,8 +39,8 @@ extern int smb_send(struct socket , struct smb_hdr ,
	unsigned int /* length / , struct sockaddr );		unsigned int /* length / , struct sockaddr );
	extern unsigned int _GetXid(void);		extern unsigned int _GetXid(void);
	extern void _FreeXid(unsigned int);		extern void _FreeXid(unsigned int);
	#define GetXid() (int)_GetXid(); cFYI(1,("CIFS VFS: in %s as Xid: %d with uid: %d",__FUNCTION__, xid,current->fsuid));		#define GetXid() (int)_GetXid(); cFYI(1,("CIFS VFS: in %s as Xid: %d with uid: %d",__func__, xid,current->fsuid));
	#define FreeXid(curr_xid) {_FreeXid(curr_xid); cFYI(1,("CIFS VFS: leaving %s (xid = %d) rc = %d",__FUNCTION__,curr_xid,(int)rc));}		#define FreeXid(curr_xid) {_FreeXid(curr_xid); cFYI(1,("CIFS VFS: leaving %s (xid = %d) rc = %d",__func__,curr_xid,(int)rc));}
	extern char build_path_from_dentry(struct dentry );		extern char build_path_from_dentry(struct dentry );
	extern char build_wildcard_path_from_dentry(struct dentry direntry);		extern char build_wildcard_path_from_dentry(struct dentry direntry);
	/* extern void renew_parental_timestamps(struct dentry direntry);/		/* extern void renew_parental_timestamps(struct dentry direntry);/
	@@ -92,11 +92,12 @@ extern struct timespec cnvrtDosUnixTm(__u16 date, __u16 time);
	extern int cifs_get_inode_info(struct inode **pinode,		extern int cifs_get_inode_info(struct inode **pinode,
	const unsigned char *search_path,		const unsigned char *search_path,
	FILE_ALL_INFO * pfile_info,		FILE_ALL_INFO * pfile_info,
	struct super_block *sb, int xid);		struct super_block sb, int xid, const __u16 pfid);
	extern int cifs_get_inode_info_unix(struct inode **pinode,		extern int cifs_get_inode_info_unix(struct inode **pinode,
	const unsigned char *search_path,		const unsigned char *search_path,
	struct super_block *sb, int xid);		struct super_block *sb, int xid);
	extern void acl_to_uid_mode(struct inode inode, const char search_path);		extern void acl_to_uid_mode(struct inode inode, const char path,
			const __u16 *pfid);
	extern int mode_to_acl(struct inode inode, const char path, __u64);		extern int mode_to_acl(struct inode inode, const char path, __u64);

	extern int cifs_mount(struct super_block , struct cifs_sb_info , char *,		extern int cifs_mount(struct super_block , struct cifs_sb_info , char *,

Admin message