Commit d2ecad9f 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: (56 commits)
  [CIFS] move close processing  from cifs_close to cifsFileInfo_put
  cifs: convert cifs_tcp_ses_lock from a rwlock to a spinlock
  cifs: cancel_delayed_work() + flush_scheduled_work() -> cancel_delayed_work_sync()
  Clean up two declarations of blob_len
  cifs: move cifsFileInfo_put to file.c
  cifs: convert GlobalSMBSeslock from a rwlock to regular spinlock
  [CIFS] Fix minor checkpatch warning and update cifs version
  cifs: move cifs_new_fileinfo to file.c
  cifs: eliminate pfile pointer from cifsFileInfo
  cifs: cifs_write argument change and cleanup
  cifs: clean up cifs_reopen_file
  cifs: eliminate the inode argument from cifs_new_fileinfo
  cifs: eliminate oflags option from cifs_new_fileinfo
  cifs: fix flags handling in cifs_posix_open
  cifs: eliminate cifs_posix_open_inode_helper
  cifs: handle FindFirst failure gracefully
  NTLM authentication and signing - Calculate auth response per smb session
  cifs: don't use vfsmount to pin superblock for oplock breaks
  cifs: keep dentry reference in cifsFileInfo instead of inode reference
  cifs: on multiuser mount, set ownership to current_fsuid/current_fsgid (try #7)
  ...

Fix up trivial conflict in fs/cifs/cifsfs.c due to added/removed header files
parents c70b5296 cdff08e7

fs/cifs/README

+5 −0
Original line number Diff line number Diff line
@@ -527,6 +527,11 @@ A partial list of the supported mount options follows: 
		SFU does).  In the future the bottom 9 bits of the

		mode also will be emulated using queries of the security

		descriptor (ACL).

 mfsymlinks     Enable support for Minshall+French symlinks

		(see http://wiki.samba.org/index.php/UNIX_Extensions#Minshall.2BFrench_symlinks)

		This option is ignored when specified together with the

		'sfu' option. Minshall+French symlinks are used even if

		the server supports the CIFS Unix Extensions.

 sign           Must use packet signing (helps avoid unwanted data modification

		by intermediate systems in the route).  Note that signing

		does not work with lanman or plaintext authentication.

fs/cifs/cifs_debug.c

+6 −6
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) 
	seq_printf(m, "Servers:");



	i = 0;

	read_lock(&cifs_tcp_ses_lock);

	spin_lock(&cifs_tcp_ses_lock);

	list_for_each(tmp1, &cifs_tcp_ses_list) {

		server = list_entry(tmp1, struct TCP_Server_Info,

				    tcp_ses_list);
@@ -230,7 +230,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) 
			spin_unlock(&GlobalMid_Lock);

		}

	}

	read_unlock(&cifs_tcp_ses_lock);

	spin_unlock(&cifs_tcp_ses_lock);

	seq_putc(m, '\n');



	/* BB add code to dump additional info such as TCP session info now */
@@ -270,7 +270,7 @@ static ssize_t cifs_stats_proc_write(struct file *file, 
		atomic_set(&totBufAllocCount, 0);

		atomic_set(&totSmBufAllocCount, 0);

#endif /* CONFIG_CIFS_STATS2 */

		read_lock(&cifs_tcp_ses_lock);

		spin_lock(&cifs_tcp_ses_lock);

		list_for_each(tmp1, &cifs_tcp_ses_list) {

			server = list_entry(tmp1, struct TCP_Server_Info,

					    tcp_ses_list);
@@ -303,7 +303,7 @@ static ssize_t cifs_stats_proc_write(struct file *file, 
				}

			}

		}

		read_unlock(&cifs_tcp_ses_lock);

		spin_unlock(&cifs_tcp_ses_lock);

	}



	return count;
@@ -343,7 +343,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v) 
		GlobalCurrentXid, GlobalMaxActiveXid);



	i = 0;

	read_lock(&cifs_tcp_ses_lock);

	spin_lock(&cifs_tcp_ses_lock);

	list_for_each(tmp1, &cifs_tcp_ses_list) {

		server = list_entry(tmp1, struct TCP_Server_Info,

				    tcp_ses_list);
@@ -397,7 +397,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v) 
			}

		}

	}

	read_unlock(&cifs_tcp_ses_lock);

	spin_unlock(&cifs_tcp_ses_lock);



	seq_putc(m, '\n');

	return 0;

fs/cifs/cifs_dfs_ref.c

+13 −11
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ static void cifs_dfs_expire_automounts(struct work_struct *work) 
void cifs_dfs_release_automount_timer(void)

{

	BUG_ON(!list_empty(&cifs_dfs_automount_list));

	cancel_delayed_work(&cifs_dfs_automount_task);

	flush_scheduled_work();

	cancel_delayed_work_sync(&cifs_dfs_automount_task);

}



/**
@@ -306,6 +305,7 @@ cifs_dfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd) 
	int xid, i;

	int rc = 0;

	struct vfsmount *mnt = ERR_PTR(-ENOENT);

	struct tcon_link *tlink;



	cFYI(1, "in %s", __func__);

	BUG_ON(IS_ROOT(dentry));
@@ -315,14 +315,6 @@ cifs_dfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd) 
	dput(nd->path.dentry);

	nd->path.dentry = dget(dentry);



	cifs_sb = CIFS_SB(dentry->d_inode->i_sb);

	ses = cifs_sb->tcon->ses;



	if (!ses) {

		rc = -EINVAL;

		goto out_err;

	}



	/*

	 * The MSDFS spec states that paths in DFS referral requests and

	 * responses must be prefixed by a single '\' character instead of
@@ -335,10 +327,20 @@ cifs_dfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd) 
		goto out_err;

	}



	cifs_sb = CIFS_SB(dentry->d_inode->i_sb);

	tlink = cifs_sb_tlink(cifs_sb);

	if (IS_ERR(tlink)) {

		rc = PTR_ERR(tlink);

		goto out_err;

	}

	ses = tlink_tcon(tlink)->ses;



	rc = get_dfs_path(xid, ses, full_path + 1, cifs_sb->local_nls,

		&num_referrals, &referrals,

		cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);



	cifs_put_tlink(tlink);



	for (i = 0; i < num_referrals; i++) {

		int len;

		dump_referral(referrals+i);

fs/cifs/cifs_fs_sb.h

+10 −3
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 *   the GNU Lesser General Public License for more details.

 *

 */

#include <linux/radix-tree.h>



#ifndef _CIFS_FS_SB_H

#define _CIFS_FS_SB_H
@@ -36,23 +38,28 @@ 
#define CIFS_MOUNT_NOPOSIXBRL   0x2000 /* mandatory not posix byte range lock */

#define CIFS_MOUNT_NOSSYNC      0x4000 /* don't do slow SMBflush on every sync*/

#define CIFS_MOUNT_FSCACHE	0x8000 /* local caching enabled */

#define CIFS_MOUNT_MF_SYMLINKS	0x10000 /* Minshall+French Symlinks enabled */

#define CIFS_MOUNT_MULTIUSER	0x20000 /* multiuser mount */



struct cifs_sb_info {

	struct cifsTconInfo *tcon;	/* primary mount */

	struct list_head nested_tcon_q;

	struct radix_tree_root tlink_tree;

#define CIFS_TLINK_MASTER_TAG		0	/* is "master" (mount) tcon */

	spinlock_t tlink_tree_lock;

	struct nls_table *local_nls;

	unsigned int rsize;

	unsigned int wsize;

	atomic_t active;

	uid_t	mnt_uid;

	gid_t	mnt_gid;

	mode_t	mnt_file_mode;

	mode_t	mnt_dir_mode;

	int     mnt_cifs_flags;

	unsigned int mnt_cifs_flags;

	int	prepathlen;

	char   *prepath; /* relative path under the share to mount to */

#ifdef CONFIG_CIFS_DFS_UPCALL

	char   *mountdata; /* mount options received at mount time */

#endif

	struct backing_dev_info bdi;

	struct delayed_work prune_tlinks;

};

#endif				/* _CIFS_FS_SB_H */

fs/cifs/cifsacl.c

+35 −11
Original line number Diff line number Diff line
@@ -557,11 +557,16 @@ static struct cifs_ntsd *get_cifs_acl_by_fid(struct cifs_sb_info *cifs_sb, 
{

	struct cifs_ntsd *pntsd = NULL;

	int xid, rc;

	struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);



	if (IS_ERR(tlink))

		return NULL;



	xid = GetXid();

	rc = CIFSSMBGetCIFSACL(xid, cifs_sb->tcon, fid, &pntsd, pacllen);

	rc = CIFSSMBGetCIFSACL(xid, tlink_tcon(tlink), fid, &pntsd, pacllen);

	FreeXid(xid);



	cifs_put_tlink(tlink);



	cFYI(1, "GetCIFSACL rc = %d ACL len %d", rc, *pacllen);

	return pntsd;
@@ -574,10 +579,16 @@ static struct cifs_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, 
	int oplock = 0;

	int xid, rc;

	__u16 fid;

	struct cifsTconInfo *tcon;

	struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);



	if (IS_ERR(tlink))

		return NULL;



	tcon = tlink_tcon(tlink);

	xid = GetXid();



	rc = CIFSSMBOpen(xid, cifs_sb->tcon, path, FILE_OPEN, READ_CONTROL, 0,

	rc = CIFSSMBOpen(xid, tcon, path, FILE_OPEN, READ_CONTROL, 0,

			 &fid, &oplock, NULL, cifs_sb->local_nls,

			 cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);

	if (rc) {
@@ -585,11 +596,12 @@ static struct cifs_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, 
		goto out;

	}



	rc = CIFSSMBGetCIFSACL(xid, cifs_sb->tcon, fid, &pntsd, pacllen);

	rc = CIFSSMBGetCIFSACL(xid, tcon, fid, &pntsd, pacllen);

	cFYI(1, "GetCIFSACL rc = %d ACL len %d", rc, *pacllen);



	CIFSSMBClose(xid, cifs_sb->tcon, fid);

	CIFSSMBClose(xid, tcon, fid);

 out:

	cifs_put_tlink(tlink);

	FreeXid(xid);

	return pntsd;

}
@@ -603,7 +615,7 @@ static struct cifs_ntsd *get_cifs_acl(struct cifs_sb_info *cifs_sb, 
	struct cifsFileInfo *open_file = NULL;



	if (inode)

		open_file = find_readable_file(CIFS_I(inode));

		open_file = find_readable_file(CIFS_I(inode), true);

	if (!open_file)

		return get_cifs_acl_by_path(cifs_sb, path, pacllen);
@@ -616,10 +628,15 @@ static int set_cifs_acl_by_fid(struct cifs_sb_info *cifs_sb, __u16 fid, 
		struct cifs_ntsd *pnntsd, u32 acllen)

{

	int xid, rc;

	struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);



	if (IS_ERR(tlink))

		return PTR_ERR(tlink);



	xid = GetXid();

	rc = CIFSSMBSetCIFSACL(xid, cifs_sb->tcon, fid, pnntsd, acllen);

	rc = CIFSSMBSetCIFSACL(xid, tlink_tcon(tlink), fid, pnntsd, acllen);

	FreeXid(xid);

	cifs_put_tlink(tlink);



	cFYI(DBG2, "SetCIFSACL rc = %d", rc);

	return rc;
@@ -631,10 +648,16 @@ static int set_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, const char *path, 
	int oplock = 0;

	int xid, rc;

	__u16 fid;

	struct cifsTconInfo *tcon;

	struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);



	if (IS_ERR(tlink))

		return PTR_ERR(tlink);



	tcon = tlink_tcon(tlink);

	xid = GetXid();



	rc = CIFSSMBOpen(xid, cifs_sb->tcon, path, FILE_OPEN, WRITE_DAC, 0,

	rc = CIFSSMBOpen(xid, tcon, path, FILE_OPEN, WRITE_DAC, 0,

			 &fid, &oplock, NULL, cifs_sb->local_nls,

			 cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);

	if (rc) {
@@ -642,12 +665,13 @@ static int set_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, const char *path, 
		goto out;

	}



	rc = CIFSSMBSetCIFSACL(xid, cifs_sb->tcon, fid, pnntsd, acllen);

	rc = CIFSSMBSetCIFSACL(xid, tcon, fid, pnntsd, acllen);

	cFYI(DBG2, "SetCIFSACL rc = %d", rc);



	CIFSSMBClose(xid, cifs_sb->tcon, fid);

	CIFSSMBClose(xid, tcon, fid);

out:

	FreeXid(xid);

	cifs_put_tlink(tlink);

	return rc;

}
@@ -661,7 +685,7 @@ static int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen, 


	cFYI(DBG2, "set ACL for %s from mode 0x%x", path, inode->i_mode);



	open_file = find_readable_file(CIFS_I(inode));

	open_file = find_readable_file(CIFS_I(inode), true);

	if (!open_file)

		return set_cifs_acl_by_path(cifs_sb, path, pnntsd, acllen);

CRA Git | Maintained and supported by SUSTech CRA and CCSE