summaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfsLinus Torvalds2011-07-291-1/+4
|\
| * xfs: Fix build breakage in xfs_iops.c when CONFIG_FS_POSIX_ACL is not setMarkus Trippelsdorf2011-07-291-1/+4
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...Linus Torvalds2011-07-292-22/+26
|\ \
| * | ecryptfs: Make inode bdi consistent with superblock bdiThieu Le2011-07-281-0/+1
| * | eCryptfs: Unlock keys needed by ecryptfsdTyler Hicks2011-07-281-22/+25
| |/
* | ext2: remove duplicate 'ext2_get_acl()' defineLinus Torvalds2011-07-291-1/+0
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2011-07-272-115/+48
|\
| * Merge branch 'linus' into nextJames Morris2011-06-30101-1151/+1400
| |\
| * | eCryptfs: added support for the encrypted key typeRoberto Sassu2011-06-272-7/+47
| * | eCryptfs: export global eCryptfs definitions to include/linux/ecryptfs.hRoberto Sassu2011-06-271-108/+1
* | | 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-2722-437/+1500
|\ \ \ \ \ \
| * | | | | | 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
| * | | | | | Merge branch 'master' into devel and apply fixup from Stephen Rothwell:Stephen Rothwell2011-07-25301-7820/+7021
| |\ \ \ \ \ \
| * | | | | | | 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: sunrpc should not explicitly depend on NFS config optionsTrond Myklebust2011-07-151-0/+1
| * | | | | | | 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-156-34/+80
| * | | | | | | NFS: Move the pnfs read code into pnfs.cTrond Myklebust2011-07-156-40/+83
| * | | | | | | NFS: Allow the nfs_pageio_descriptor to signal that a re-coalesce is neededTrond Myklebust2011-07-151-3/+54
| * | | | | | | 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-152-24/+15
OpenPOWER on IntegriCloud