Commit caa4a595 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 bogus remapping of error in cifs_filldir()
  cifs: allow calling cifs_build_path_to_root on incomplete cifs_sb
  cifs: fix check of error return from is_path_accessable
  cifs: remove Local_System_Name
  cifs: fix use of CONFIG_CIFS_ACL
  cifs: add attribute cache timeout (actimeo) tunable
parents 6313e3c2 545c988b

fs/cifs/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -6,7 +6,9 @@ obj-$(CONFIG_CIFS) += cifs.o 
cifs-y := 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 \

	  readdir.o ioctl.o sess.o export.o cifsacl.o

	  readdir.o ioctl.o sess.o export.o



cifs-$(CONFIG_CIFS_ACL) += cifsacl.o



cifs-$(CONFIG_CIFS_UPCALL) += cifs_spnego.o

fs/cifs/README

+9 −0
Original line number Diff line number Diff line
@@ -337,6 +337,15 @@ A partial list of the supported mount options follows: 
  wsize		default write size (default 57344)

		maximum wsize currently allowed by CIFS is 57344 (fourteen

		4096 byte pages)

  actimeo=n	attribute cache timeout in seconds (default 1 second).

		After this timeout, the cifs client requests fresh attribute

		information from the server. This option allows to tune the

		attribute cache timeout to suit the workload needs. Shorter

		timeouts mean better the cache coherency, but increased number

		of calls to the server. Longer timeouts mean reduced number

		of calls to the server at the expense of less stricter cache

		coherency checks (i.e. incorrect attribute cache for a short

		period of time).

  rw		mount the network share read-write (note that the

		server may still consider the share read-only)

  ro		mount network share read-only

fs/cifs/cifs_fs_sb.h

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ struct cifs_sb_info { 
	struct nls_table *local_nls;

	unsigned int rsize;

	unsigned int wsize;

	unsigned long actimeo; /* attribute cache timeout (jiffies) */

	atomic_t active;

	uid_t	mnt_uid;

	gid_t	mnt_gid;

fs/cifs/cifsacl.c

+0 −3
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 
#include "cifs_debug.h"





#ifdef CONFIG_CIFS_EXPERIMENTAL



static struct cifs_wksid wksidarr[NUM_WK_SIDS] = {

	{{1, 0, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0} }, "null user"},

	{{1, 1, {0, 0, 0, 0, 0, 1}, {0, 0, 0, 0, 0} }, "nobody"},
@@ -774,4 +772,3 @@ int mode_to_cifs_acl(struct inode *inode, const char *path, __u64 nmode) 


	return rc;

}
 
#endif /* CONFIG_CIFS_EXPERIMENTAL */

fs/cifs/cifsacl.h

+0 −4
Original line number Diff line number Diff line
@@ -74,11 +74,7 @@ struct cifs_wksid { 
	char sidname[SIDNAMELENGTH];

} __attribute__((packed));



#ifdef CONFIG_CIFS_EXPERIMENTAL



extern int match_sid(struct cifs_sid *);

extern int compare_sids(const struct cifs_sid *, const struct cifs_sid *);



#endif /*  CONFIG_CIFS_EXPERIMENTAL */



#endif /* _CIFSACL_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE