summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2011-07-2723-1010/+965
|\
| * Merge branch 'integration' into for-linusChris Mason2011-07-2723-1010/+965
| |\
| | * Btrfs: make sure reserve_metadata_bytes doesn't leak out strange errorsChris Mason2011-07-271-1/+6
| | * Btrfs: use the commit_root for reading free_space_inode crcsChris Mason2011-07-273-19/+28
| | * Btrfs: reduce extent_state lock contention for metadataChris Mason2011-07-271-14/+41
| | * Btrfs: remove lockdep magic from btrfs_next_leafChris Mason2011-07-271-31/+5
| | * Btrfs: make a lockdep class for each rootChris Mason2011-07-274-38/+79
| | * Btrfs: switch the btrfs tree locks to reader/writerChris Mason2011-07-279-218/+431
| | * Btrfs: fix deadlock when throttling transactionsJosef Bacik2011-07-271-2/+9
| | * Btrfs: stop using highmem for extent_buffersChris Mason2011-07-277-378/+52
| | * Btrfs: fix BUG_ON() caused by ENOSPC when relocating spaceMiao Xie2011-07-271-7/+21
| | * Btrfs: tag pages for writeback in syncJosef Bacik2011-07-271-3/+9
| | * Btrfs: fix enospc problems with delallocJosef Bacik2011-07-276-60/+86
| | * Btrfs: don't flush delalloc arbitrarilyJosef Bacik2011-07-271-3/+0
| | * Btrfs: use find_or_create_page instead of grab_cache_pageJosef Bacik2011-07-275-7/+9
| | * Btrfs: use a worker thread to do cachingJosef Bacik2011-07-273-29/+27
| | * Btrfs: fix how we merge extent states and deal with cached statesJosef Bacik2011-07-111-12/+11
| | * Btrfs: use the normal checksumming infrastructure for free space cacheJosef Bacik2011-07-111-110/+59
| | * Btrfs: serialize flushers in reserve_metadata_bytesJosef Bacik2011-07-112-21/+51
| | * Btrfs: do transaction space reservation before joining the transactionJosef Bacik2011-07-113-42/+17
| | * Btrfs: try to only do one btrfs_search_slot in do_setxattrJosef Bacik2011-07-112-33/+42
* | | Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfsLinus Torvalds2011-07-274-13/+33
|\ \ \
| * | | xfs: optimize the negative xattr cachingChristoph Hellwig2011-07-261-2/+7
| * | | xfs: prevent against ioend livelocks in xfs_file_fsyncChristoph Hellwig2011-07-261-0/+2
| * | | xfs: flag all buffers as metadataChristoph Hellwig2011-07-261-0/+3
| * | | xfs: encapsulate a block of debug codeAlex Elder2011-07-261-11/+21
* | | | Merge branch 'nfs-for-3.1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2011-07-2744-632/+1856
|\ \ \ \
| * | | | NFSv4: Don't use the delegation->inode in nfs_mark_return_delegation()Trond Myklebust2011-07-251-8/+8
| * | | | nfs: don't use d_move in nfs_async_rename_doneJeff Layton2011-07-251-10/+19
| * | | | RDMA: Increasing RPCRDMA_MAX_DATA_SEGSSteve Dickson2011-07-251-1/+1
| * | | | Merge branch 'master' into devel and apply fixup from Stephen Rothwell:Stephen Rothwell2011-07-253918-111930/+247909
| |\ \ \ \
| * | | | | SUNRPC: Replace xprt->resend and xprt->sending with a priority queueTrond Myklebust2011-07-172-22/+21
| * | | | | SUNRPC: Allow caller of rpc_sleep_on() to select priority levelsTrond Myklebust2011-07-172-9/+33
| * | | | | SUNRPC: Support dynamic slot allocation for TCP connectionsTrond Myklebust2011-07-174-20/+109
| * | | | | SUNRPC: Clean up the slot table allocationTrond Myklebust2011-07-172-29/+37
| * | | | | SUNRPC: Initalise the struct xprt upon allocationTrond Myklebust2011-07-171-30/+37
| * | | | | SUNRPC: Ensure that we grab the XPRT_LOCK before calling xprt_alloc_slotTrond Myklebust2011-07-174-30/+49
| * | | | | pnfs: simplify pnfs files module autoloadingJ. Bruce Fields2011-07-152-0/+4
| * | | | | nfs: document nfsv4 sillyrename issuesJ. Bruce Fields2011-07-151-0/+8
| * | | | | NFS: Convert nfs4_set_ds_client to EXPORT_SYMBOL_GPLTrond Myklebust2011-07-151-1/+1
| * | | | | SUNRPC: Convert the backchannel exports to EXPORT_SYMBOL_GPLTrond Myklebust2011-07-153-4/+4
| * | | | | SUNRPC: sunrpc should not explicitly depend on NFS config optionsTrond Myklebust2011-07-1513-40/+39
| * | | | | NFS: Clean up - simplify the switch to read/write-through-MDSTrond Myklebust2011-07-155-13/+8
| * | | | | NFS: Move the pnfs write code into pnfs.cTrond Myklebust2011-07-157-37/+80
| * | | | | NFS: Move the pnfs read code into pnfs.cTrond Myklebust2011-07-157-41/+83
| * | | | | NFS: Allow the nfs_pageio_descriptor to signal that a re-coalesce is neededTrond Myklebust2011-07-152-4/+56
| * | | | | NFS: Use the nfs_pageio_descriptor->pg_bsize in the read/write requestTrond Myklebust2011-07-152-2/+2
| * | | | | NFS: Cache rpc_ops in struct nfs_pageio_descriptorTrond Myklebust2011-07-153-24/+16
| * | | | | NFS: Clean up: split out the RPC transmission from nfs_pagein_multi/oneTrond Myklebust2011-07-152-83/+102
| * | | | | NFS: fix return value of nfs_pagein_one/nfs_flush_onePeng Tao2011-07-152-2/+3
OpenPOWER on IntegriCloud