Commit a6c0e1f7 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] remove unused variable
  [CIFS] consolidate duplicate code in posix/unix inode handling
  [CIFS] fix build break when proc disabled
  [CIFS] factoring out common code in get_inode_info functions
  [CIFS] fix prepath conversion when server supports posix paths
  [CIFS] Only convert / when server does not support posix paths
  [CIFS] Fix mixed case name in structure dfs_info3_param
  [CIFS] fixup prefixpaths which contain multiple path components
  [CIFS] fix typo
  [CIFS] patch to fix incorrect encoding of number of aces on set mode
  [CIFS] Fix typo in quota operations
  [CIFS] clean up some hard to read ifdefs
  [CIFS] reduce checkpatch warnings
  [CIFS] fix warning in cifs_spnego.c
parents 13b1c3d4 966ea8c4

fs/cifs/CHANGES

+3 −1
Original line number Diff line number Diff line
@@ -6,7 +6,9 @@ and sync so that events like out of disk space get reported properly on 
cached files. Fix setxattr failure to certain Samba versions. Fix mount

of second share to disconnected server session (autoreconnect on this).

Add ability to modify cifs acls for handling chmod (when mounted with

cifsacl flag).

cifsacl flag). Fix prefixpath path separator so we can handle mounts

with prefixpaths longer than one directory (one path component) when

mounted to Windows servers.



Version 1.51

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

fs/cifs/README

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ A partial list of the supported mount options follows: 
 cifsacl        Report mode bits (e.g. on stat) based on the Windows ACL for

	        the file. (EXPERIMENTAL)

 servern        Specify the server 's netbios name (RFC1001 name) to use

		when attempting to setup a session to the server.  This is

		when attempting to setup a session to the server. 

		This is needed for mounting to some older servers (such

		as OS/2 or Windows 98 and Windows ME) since they do not

		support a default server name.  A server name can be up

fs/cifs/cifs_debug.c

+12 −5
Original line number Diff line number Diff line
@@ -98,8 +98,7 @@ void cifs_dump_mids(struct TCP_Server_Info *server) 
			if (mid_entry->resp_buf) {

				cifs_dump_detail(mid_entry->resp_buf);

				cifs_dump_mem("existing buf: ",

					mid_entry->resp_buf,

					62 /* fixme */);

					mid_entry->resp_buf, 62);

			}

		}

	}
@@ -439,7 +438,7 @@ cifs_stats_read(char *buf, char **beginBuffer, off_t offset, 


	return length;

}

#endif

#endif /* STATS */



static struct proc_dir_entry *proc_fs_cifs;

read_proc_t cifs_txanchor_read;
@@ -482,7 +481,7 @@ cifs_proc_init(void) 
				cifs_stats_read, NULL);

	if (pde)

		pde->write_proc = cifs_stats_write;

#endif

#endif /* STATS */

	pde = create_proc_read_entry("cifsFYI", 0, proc_fs_cifs,

				cifsFYI_read, NULL);

	if (pde)
@@ -918,4 +917,12 @@ security_flags_write(struct file *file, const char __user *buffer, 
	/* BB should we turn on MAY flags for other MUST options? */

	return count;

}

#endif
 
#else

inline void cifs_proc_init(void)

{

}



inline void cifs_proc_clean(void)

{

}

#endif /* PROC_FS */

fs/cifs/cifs_debug.h

+6 −3
Original line number Diff line number Diff line
@@ -25,8 +25,11 @@ 


void cifs_dump_mem(char *label, void *data, int length);

#ifdef CONFIG_CIFS_DEBUG2

#define DBG2 2

void cifs_dump_detail(struct smb_hdr *);

void cifs_dump_mids(struct TCP_Server_Info *);

#else

#define DBG2 0

#endif

extern int traceSMB;		/* flag which enables the function below */

void dump_smb(struct smb_hdr *, int);

fs/cifs/cifs_dfs_ref.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static void dump_referral(const struct dfs_info3_param *ref) 
	cFYI(1, ("DFS: node path: %s", ref->node_name));

	cFYI(1, ("DFS: fl: %hd, srv_type: %hd", ref->flags, ref->server_type));

	cFYI(1, ("DFS: ref_flags: %hd, path_consumed: %hd", ref->ref_flag,

				ref->PathConsumed));

				ref->path_consumed));

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE