summaryrefslogtreecommitdiff
path: root/fs/sync.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-29 12:42:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-29 12:42:10 -0700
commit442a9ffabb21f175027e93e72ea05159818271a6 (patch)
treec9c708a36c8af91389527dbf310ef8ee2c4e3409 /fs/sync.c
parent4b781474682434e7881f20e9dfbe6687ea619795 (diff)
parent2c0c2a08bed7a3b791f88d09d16ace56acb3dd98 (diff)
downloadlinux-3.10-442a9ffabb21f175027e93e72ea05159818271a6.tar.gz
linux-3.10-442a9ffabb21f175027e93e72ea05159818271a6.tar.bz2
linux-3.10-442a9ffabb21f175027e93e72ea05159818271a6.zip
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS updates from Steve French. * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: (29 commits) cifs: fix oops while traversing open file list (try #4) cifs: Fix comment as d_alloc_root() is replaced by d_make_root() CIFS: Introduce SMB2 mounts as vers=2.1 CIFS: Introduce SMB2 Kconfig option CIFS: Move add/set_credits and get_credits_field to ops structure CIFS: Move protocol specific demultiplex thread calls to ops struct CIFS: Move protocol specific part from cifs_readv_receive to ops struct CIFS: Move header_size/max_header_size to ops structure CIFS: Move protocol specific part from SendReceive2 to ops struct cifs: Include backup intent search flags during searches {try #2) CIFS: Separate protocol specific part from setlk CIFS: Separate protocol specific part from getlk CIFS: Separate protocol specific lock type handling CIFS: Convert lock type to 32 bit variable CIFS: Move locks to cifsFileInfo structure cifs: convert send_nt_cancel into a version specific op cifs: add a smb_version_operations/values structures and a smb_version enum cifs: remove the vers= and version= synonyms for ver= cifs: add warning about change in default cache semantics in 3.7 cifs: display cache= option in /proc/mounts ...
Diffstat (limited to 'fs/sync.c')
0 files changed, 0 insertions, 0 deletions