summaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* NFS: Re-enable compilation of nfs with !CONFIG_NFS_V4 || !CONFIG_NFS_V4_1Trond Myklebust2011-07-311-1/+1
* Merge branch 'nfs-for-3.1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2011-07-3116-87/+3090
|\
| * pnfsblock: write_pagelist handle zero invalid extentsPeng Tao2011-07-311-42/+233
| * pnfsblock: note written INVAL areas for layoutcommitFred Isaman2011-07-313-0/+129
| * pnfsblock: bl_write_pagelistFred Isaman2011-07-311-3/+126
| * pnfsblock: bl_read_pagelistFred Isaman2011-07-311-0/+265
| * pnfsblock: cleanup_layoutcommitFred Isaman2011-07-313-0/+217
| * pnfsblock: encode_layoutcommitFred Isaman2011-07-313-44/+146
| * pnfsblock: merge rw extentsFred Isaman2011-07-311-0/+47
| * pnfsblock: add extent manipulation functionsFred Isaman2011-07-313-3/+287
| * pnfsblock: bl_find_get_extentFred Isaman2011-07-312-0/+50
| * pnfsblock: xdr decode pnfs_block_layout4Fred Isaman2011-07-311-2/+206
| * pnfsblock: call and parse getdevicelistFred Isaman2011-07-314-8/+157
| * pnfsblock: merge extentsFred Isaman2011-07-312-0/+119
| * pnfsblock: lseg alloc and freeFred Isaman2011-07-313-6/+39
| * pnfsblock: remove device operationsJim Rees2011-07-313-1/+115
| * pnfsblock: add device operationsJim Rees2011-07-315-2/+275
| * pnfsblock: basic extent codeFred Isaman2011-07-314-5/+107
| * pnfsblock: use pageio_ops apiBenny Halevy2011-07-311-0/+14
| * pnfsblock: add blocklayout Kconfig option, Makefile, and stubsFred Isaman2011-07-315-1/+278
| * pnfs: cleanup_layoutcommitAndy Adamson2011-07-314-0/+13
| * pnfs: ask for layout_blksize and save it in nfs_serverFred Isaman2011-07-314-20/+87
| * pnfs: add set-clear layoutdriver interfaceBenny Halevy2011-07-313-7/+24
| * pnfs: GETDEVICELISTAndy Adamson2011-07-313-0/+191
| * pnfs: use lwb as layoutcommit lengthPeng Tao2011-07-311-1/+1
| * pnfs: let layoutcommit handle a list of lsegPeng Tao2011-07-313-17/+25
| * pnfs: save layoutcommit cred at layout header initPeng Tao2011-07-312-11/+12
| * pnfs: save layoutcommit lwb at layout headerPeng Tao2011-07-313-6/+8
| * Additional readdir cookie loop informationBryan Schumaker2011-07-301-1/+2
| * NFS: Fix spurious readdir cookie loop messagesTrond Myklebust2011-07-301-23/+33
* | don't busy retry the inode on failed grab_super_passive()Wu Fengguang2011-07-311-1/+6
* | 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
OpenPOWER on IntegriCloud