Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12e36b2f 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: (27 commits)
  [CIFS] Missing flags2 for DFS
  [CIFS] Workaround incomplete byte length returned by some
  [CIFS] cifs Kconfig: don't select CONNECTOR
  [CIFS] Level 1 QPathInfo needed for proper OS2 support
  [CIFS] fix typo in previous patch
  [CIFS] Fix old DOS time conversion to handle timezone
  [CIFS] Do not need to adjust for Jan/Feb for leap day
  [CIFS] Fix leaps year calculation for years after 2100
  [CIFS] readdir (ffirst) enablement of accurate timestamps from legacy servers
  [CIFS] Fix compiler warning with previous patch
  [CIFS] Fix typo
  [CIFS] Allow for 15 minute TZs (e.g. Nepal) and be more explicit about
  [CIFS] Fix readdir of large directories for backlevel servers
  [CIFS] Allow LANMAN21 support even in both POSIX non-POSIX path
  [CIFS] Make use of newer QFSInfo dependent on capability bit instead of
  [CIFS] Do not send newer QFSInfo to legacy servers which can not support it
  [CIFS] Fix typo in name of new cifs_show_stats
  [CIFS] Rename server time zone field
  [CIFS] Handle legacy servers which return undefined time zone
  [CIFS] CIFS support for /proc/<pid>/mountstats part 1
  ...

Manual conflict resolution in fs/cifs/connect.c
parents 1baaf0b4 1a4e15a0

fs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1986,7 +1986,7 @@ config CIFS_EXPERIMENTAL 
config CIFS_UPCALL

	  bool "Kerberos/SPNEGO advanced session setup (EXPERIMENTAL)"

	  depends on CIFS_EXPERIMENTAL

	  select CONNECTOR

	  depends on CONNECTOR

	  help

	    Enables an upcall mechanism for CIFS which will be used to contact

	    userspace helper utilities to provide SPNEGO packaged Kerberos

fs/cifs/cifsacl.h

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ struct cifs_sid { 
} __attribute__((packed));



/* everyone */

extern const struct cifs_sid sid_everyone;

/* extern const struct cifs_sid sid_everyone;*/

/* group users */

extern const struct cifs_sid sid_user;

/* extern const struct cifs_sid sid_user;*/



#endif /* _CIFSACL_H */

fs/cifs/cifsencrypt.h

+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ extern void mdfour(unsigned char *out, unsigned char *in, int n); 
/* smbdes.c */

extern void E_P16(unsigned char *p14, unsigned char *p16);

extern void E_P24(unsigned char *p21, unsigned char *c8, unsigned char *p24);

extern void D_P16(unsigned char *p14, unsigned char *in, unsigned char *out);

extern void E_old_pw_hash(unsigned char *, unsigned char *, unsigned char *);

fs/cifs/cifsfs.c

+21 −6
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ extern struct task_struct * oplockThread; /* remove sparse warning */ 
struct task_struct * oplockThread = NULL;

extern struct task_struct * dnotifyThread; /* remove sparse warning */

struct task_struct * dnotifyThread = NULL;

static struct super_operations cifs_super_ops; 

unsigned int CIFSMaxBufSize = CIFS_MAX_MSGSIZE;

module_param(CIFSMaxBufSize, int, 0);

MODULE_PARM_DESC(CIFSMaxBufSize,"Network buffer size (not including header). Default: 16384 Range: 8192 to 130048");
@@ -198,10 +199,12 @@ cifs_statfs(struct dentry *dentry, struct kstatfs *buf) 
    /* Only need to call the old QFSInfo if failed

    on newer one */

    if(rc)

	rc = CIFSSMBQFSInfo(xid, pTcon, buf);

	if(pTcon->ses->capabilities & CAP_NT_SMBS)

		rc = CIFSSMBQFSInfo(xid, pTcon, buf); /* not supported by OS2 */



	/* Old Windows servers do not support level 103, retry with level 

	   one if old server failed the previous call */ 

	/* Some old Windows servers also do not support level 103, retry with

	   older level one if old server failed the previous call or we

	   bypassed it because we detected that this was an older LANMAN sess */

	if(rc)

		rc = SMBOldQFSInfo(xid, pTcon, buf);

	/*
@@ -435,13 +438,21 @@ static void cifs_umount_begin(struct vfsmount * vfsmnt, int flags) 
	return;

}



#ifdef CONFIG_CIFS_STATS2

static int cifs_show_stats(struct seq_file *s, struct vfsmount *mnt)

{

	/* BB FIXME */

	return 0;

}

#endif



static int cifs_remount(struct super_block *sb, int *flags, char *data)

{

	*flags |= MS_NODIRATIME;

	return 0;

}



struct super_operations cifs_super_ops = {

static struct super_operations cifs_super_ops = {

	.read_inode = cifs_read_inode,

	.put_super = cifs_put_super,

	.statfs = cifs_statfs,
@@ -454,6 +465,9 @@ struct super_operations cifs_super_ops = { 
	.show_options = cifs_show_options,

	.umount_begin   = cifs_umount_begin,

	.remount_fs = cifs_remount,

#ifdef CONFIG_CIFS_STATS2

	.show_stats = cifs_show_stats,

#endif

};



static int
@@ -495,7 +509,7 @@ static ssize_t cifs_file_aio_write(struct kiocb *iocb, const struct iovec *iov, 
static loff_t cifs_llseek(struct file *file, loff_t offset, int origin)

{

	/* origin == SEEK_END => we must revalidate the cached file length */

	if (origin == 2) {

	if (origin == SEEK_END) {

		int retval = cifs_revalidate(file->f_dentry);

		if (retval < 0)

			return (loff_t)retval;
@@ -903,7 +917,7 @@ init_cifs(void) 
#ifdef CONFIG_PROC_FS

	cifs_proc_init();

#endif

	INIT_LIST_HEAD(&GlobalServerList);	/* BB not implemented yet */

/*	INIT_LIST_HEAD(&GlobalServerList);*/	/* BB not implemented yet */

	INIT_LIST_HEAD(&GlobalSMBSessionList);

	INIT_LIST_HEAD(&GlobalTreeConnectionList);

	INIT_LIST_HEAD(&GlobalOplock_Q);
@@ -931,6 +945,7 @@ init_cifs(void) 
	GlobalCurrentXid = 0;

	GlobalTotalActiveXid = 0;

	GlobalMaxActiveXid = 0;

	memset(Local_System_Name, 0, 15);

	rwlock_init(&GlobalSMBSeslock);

	spin_lock_init(&GlobalMid_Lock);

fs/cifs/cifsfs.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ extern const struct address_space_operations cifs_addr_ops; 
extern const struct address_space_operations cifs_addr_ops_smallbuf;



/* Functions related to super block operations */

extern struct super_operations cifs_super_ops;

/* extern struct super_operations cifs_super_ops;*/

extern void cifs_read_inode(struct inode *);

extern void cifs_delete_inode(struct inode *);

/* extern void cifs_write_inode(struct inode *); *//* BB not needed yet */