summaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'akpm' (Andrew's patch-bomb)Linus Torvalds2012-05-293-4/+4
|\
| * mm, oom: normalize oom scores to oom_score_adj scale only for userspaceDavid Rientjes2012-05-291-2/+3
| * mm/fs: remove truncate_rangeHugh Dickins2012-05-291-1/+0
| * mm: fix NULL ptr deref when walking hugepagesSasha Levin2012-05-291-1/+1
* | Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6Linus Torvalds2012-05-2917-587/+1039
|\ \ | |/ |/|
| * cifs: fix oops while traversing open file list (try #4)Shirish Pargaonkar2012-05-232-24/+34
| * cifs: Fix comment as d_alloc_root() is replaced by d_make_root()Sedat Dilek2012-05-231-1/+1
| * CIFS: Introduce SMB2 mounts as vers=2.1Steve French2012-05-234-1/+41
| * CIFS: Introduce SMB2 Kconfig optionSteve French2012-05-231-0/+20
| * CIFS: Move add/set_credits and get_credits_field to ops structurePavel Shilovsky2012-05-237-50/+62
| * CIFS: Move protocol specific demultiplex thread calls to ops structPavel Shilovsky2012-05-235-27/+39
| * CIFS: Move protocol specific part from cifs_readv_receive to ops structPavel Shilovsky2012-05-233-27/+33
| * CIFS: Move header_size/max_header_size to ops structurePavel Shilovsky2012-05-234-23/+20
| * CIFS: Move protocol specific part from SendReceive2 to ops structPavel Shilovsky2012-05-234-3/+15
| * cifs: Include backup intent search flags during searches {try #2)Shirish Pargaonkar2012-05-173-11/+22
| * CIFS: Separate protocol specific part from setlkPavel Shilovsky2012-05-171-2/+2
| * CIFS: Separate protocol specific part from getlkPavel Shilovsky2012-05-173-22/+39
| * CIFS: Separate protocol specific lock type handlingPavel Shilovsky2012-05-163-16/+33
| * CIFS: Convert lock type to 32 bit variablePavel Shilovsky2012-05-162-7/+8
| * CIFS: Move locks to cifsFileInfo structurePavel Shilovsky2012-05-163-44/+58
| * cifs: convert send_nt_cancel into a version specific opJeff Layton2012-05-163-39/+54
| * cifs: add a smb_version_operations/values structures and a smb_version enumJeff Layton2012-05-165-2/+89
| * cifs: remove the vers= and version= synonyms for ver=Jeff Layton2012-05-161-4/+1
| * cifs: add warning about change in default cache semantics in 3.7Jeff Layton2012-05-161-0/+13
| * cifs: display cache= option in /proc/mountsJeff Layton2012-05-161-4/+14
| * cifs: add deprecation warnings to strictcache and forcedirectioJeff Layton2012-05-161-0/+6
| * cifs: add a cache= option to better describe the different cache flavorsJeff Layton2012-05-161-3/+54
| * cifs: add a deprecation warning to CIFS_IOC_CHECKUMOUNT ioctlJeff Layton2012-05-161-0/+8
| * cifs: remove legacy MultiuserMount optionJeff Layton2012-05-165-109/+1
| * cifs: convert cifs_iovec_read to use async readsJeff Layton2012-05-162-60/+236
| * cifs: add wrapper for cifs_async_readv to retry opening fileJeff Layton2012-05-161-9/+18
| * cifs: add refcounting to cifs_readdata structuresJeff Layton2012-05-163-7/+19
| * cifs: abstract out function to marshal the iovec for readv receivesJeff Layton2012-05-163-63/+74
| * cifs: make cifs_readdata_alloc take a work_func_t argJeff Layton2012-05-163-53/+49
* | Merge tag 'nfs-for-3.5-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2012-05-2939-2786/+3743
|\ \
| * | NFSv4: Add debugging printks to state managerTrond Myklebust2012-05-281-0/+33
| * | NFSv4: Map NFS4ERR_SHARE_DENIED into an EACCES error instead of EIOTrond Myklebust2012-05-281-0/+2
| * | NFSv4: update_changeattr does not need to set NFS_INO_REVAL_PAGECACHETrond Myklebust2012-05-281-1/+1
| * | NFSv4.1: nfs4_reset_session should use nfs4_handle_reclaim_lease_errorTrond Myklebust2012-05-271-1/+1
| * | NFSv4.1: Handle other occurrences of NFS4ERR_CONN_NOT_BOUND_TO_SESSIONTrond Myklebust2012-05-274-9/+15
| * | NFSv4.1: Handle NFS4ERR_CONN_NOT_BOUND_TO_SESSION in the state managerTrond Myklebust2012-05-271-1/+3
| * | NFSv4.1: Handle errors in nfs4_bind_conn_to_sessionTrond Myklebust2012-05-271-1/+12
| * | NFSv4.1: nfs4_bind_conn_to_session should drain the sessionTrond Myklebust2012-05-271-0/+2
| * | NFSv4.1: Don't clobber the seqid if exchange_id returns a confirmed clientidTrond Myklebust2012-05-262-12/+12
| * | NFSv4.1: Add DESTROY_CLIENTIDTrond Myklebust2012-05-264-0/+113
| * | NFSv4.1: Ensure we use the correct credentials for bind_conn_to_sessionTrond Myklebust2012-05-253-3/+11
| * | NFSv4.1: Ensure we use the correct credentials for session create/destroyTrond Myklebust2012-05-253-15/+26
| * | NFSv4.1: Move NFSPROC4_CLNT_BIND_CONN_TO_SESSION to the end of the operationsTrond Myklebust2012-05-251-2/+2
| * | NFSv4.1: Handle NFS4ERR_SEQ_MISORDERED when confirming the leaseTrond Myklebust2012-05-251-0/+5
| * | NFSv4: When purging the lease, we must clear NFS4CLNT_LEASE_CONFIRMTrond Myklebust2012-05-251-0/+1
OpenPOWER on IntegriCloud