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

Commit 9f6632d6 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] cifs_prepare_write was incorrectly rereading page in some cases
  [CIFS] Fix set file size to zero when doing chmod to Samba 3.0.26pre
  [CIFS] Remove some unused functions/declarations
  [CIFS] New file for previous commit
  [CIFS] cifs export operations
  [CIFS] small piece missing from previous patch
  [CIFS] Fix locking problem around some cifs uses of i_size write
parents 8328258e 8a236264

fs/cifs/CHANGES

+7 −0
Original line number Diff line number Diff line 
Verison 1.48

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

Fix mtime bouncing around from local idea of last write times to remote time.

Fix hang (in i_size_read) when simultaneous size update of same remote file

on smp system corrupts sequence number. Do not reread unnecessarily partial page

(which we are about to overwrite anyway) when writing out file opened rw.



Version 1.47

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

Fix oops in list_del during mount caused by unaligned string.

fs/cifs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ 
#

obj-$(CONFIG_CIFS) += cifs.o



cifs-objs := cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o inode.o link.o misc.o netmisc.o smbdes.o smbencrypt.o transport.o asn1.o md4.o md5.o cifs_unicode.o nterr.o xattr.o cifsencrypt.o fcntl.o readdir.o ioctl.o sess.o
 
cifs-objs := cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o inode.o link.o misc.o netmisc.o smbdes.o smbencrypt.o transport.o asn1.o md4.o md5.o cifs_unicode.o nterr.o xattr.o cifsencrypt.o fcntl.o readdir.o ioctl.o sess.o export.o

fs/cifs/TODO

+7 −9
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ better) 


d) Kerberos/SPNEGO session setup support - (started)



e) NTLMv2 authentication (mostly implemented)

e) NTLMv2 authentication (mostly implemented - double check

that NTLMv2 signing works, also need to cleanup now unneeded SessSetup code in

fs/cifs/connect.c)



f) MD5-HMAC signing SMB PDUs when SPNEGO style SessionSetup 

used (Kerberos or NTLMSSP). Signing alreadyimplemented for NTLM
@@ -88,11 +90,12 @@ w) Finish up the dos time conversion routines needed to return old server 
time to the client (default time, of now or time 0 is used now for these 

very old servers)



x) Add support for OS/2 (LANMAN 1.2 and LANMAN2.1 based SMB servers)

x) In support for OS/2 (LANMAN 1.2 and LANMAN2.1 based SMB servers) 

need to add ability to set time to server (utimes command)



y) Finish testing of Windows 9x/Windows ME server support (started).



KNOWN BUGS (updated April 29, 2005)

KNOWN BUGS (updated February 26, 2007)

====================================

See http://bugzilla.samba.org - search on product "CifsVFS" for

current bug list.
@@ -107,11 +110,6 @@ but recognizes them 
succeed but still return access denied (appears to be Windows 

server not cifs client problem) and has not been reproduced recently.

NTFS partitions do not have this problem.

4) debug connectathon lock test case 10 which fails against

Samba (may be unmappable due to POSIX to Windows lock model

differences but worth investigating).  Also debug Samba to 

see why lock test case 7 takes longer to complete to Samba

than to Windows.



Misc testing to do

==================
@@ -119,7 +117,7 @@ Misc testing to do 
types. Try nested symlinks (8 deep). Return max path name in stat -f information



2) Modify file portion of ltp so it can run against a mounted network

share and run it against cifs vfs.

share and run it against cifs vfs in automated fashion.



3) Additional performance testing and optimization using iozone and similar - 

there are some easy changes that can be done to parallelize sequential writes,

fs/cifs/cifsfs.c

+12 −4
Original line number Diff line number Diff line 
/*

 *   fs/cifs/cifsfs.c

 *

 *   Copyright (C) International Business Machines  Corp., 2002,2004

 *   Copyright (C) International Business Machines  Corp., 2002,2007

 *   Author(s): Steve French (sfrench@us.ibm.com)

 *

 *   Common Internet FileSystem (CIFS) client
@@ -47,7 +47,11 @@ 


#ifdef CONFIG_CIFS_QUOTA

static struct quotactl_ops cifs_quotactl_ops;

#endif

#endif /* QUOTA */



#ifdef CONFIG_CIFS_EXPERIMENTAL

extern struct export_operations cifs_export_ops;

#endif /* EXPERIMENTAL */



int cifsFYI = 0;

int cifsERROR = 1;
@@ -62,8 +66,8 @@ unsigned int extended_security = CIFSSEC_DEF; 
unsigned int sign_CIFS_PDUs = 1;

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;

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

static struct task_struct * dnotifyThread = NULL;

static const struct super_operations cifs_super_ops;

unsigned int CIFSMaxBufSize = CIFS_MAX_MSGSIZE;

module_param(CIFSMaxBufSize, int, 0);
@@ -110,6 +114,10 @@ cifs_read_super(struct super_block *sb, void *data, 


	sb->s_magic = CIFS_MAGIC_NUMBER;

	sb->s_op = &cifs_super_ops;

#ifdef CONFIG_CIFS_EXPERIMENTAL

	if(experimEnabled != 0)

		sb->s_export_op = &cifs_export_ops;

#endif /* EXPERIMENTAL */	

/*	if(cifs_sb->tcon->ses->server->maxBuf > MAX_CIFS_HDR_SIZE + 512)

	    sb->s_blocksize = cifs_sb->tcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE; */

#ifdef CONFIG_CIFS_QUOTA

fs/cifs/cifsfs.h

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ extern const struct address_space_operations cifs_addr_ops_smallbuf; 
/* Functions related to super block operations */

/* extern const struct super_operations cifs_super_ops;*/

extern void cifs_read_inode(struct inode *);

extern void cifs_delete_inode(struct inode *);

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

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



/* Functions related to inodes */