summaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jac...Linus Torvalds2011-03-176-13/+23
|\
| * Merge branch 'for_next' into for_linusJan Kara2011-03-176-13/+23
| |\
| | * ext3: Always set dx_node's fake_dirent explicitly.Eric Sandeen2011-03-071-1/+1
| | * ext3: Fix an overflow in ext3_trim_fs.Tao Ma2011-03-041-3/+8
| | * jbd: Remove one to many n's in a word.Justin P. Mattock2011-02-282-2/+2
| | * ext3: skip orphan cleanup on rocompat fsAmir Goldstein2011-02-281-0/+7
| | * ext2: Fix link count corruption under heavy link+rename loadJosh Hunt2011-02-281-7/+2
| | * ext3: speed up group trim with the right free block count.Tao Ma2011-02-241-1/+2
| | * ext3: Adjust trim start with first_data_block.Tao Ma2011-02-241-5/+2
| | * quota: return -ENOMEM when memory allocation failsDavidlohr Bueso2011-02-241-1/+1
* | | Merge branch 'nfs-for-2.6.39' of git://git.linux-nfs.org/projects/trondmy/nfs...Linus Torvalds2011-03-1722-692/+1434
|\ \ \
| * | | nfs: BKL is no longer needed, so remove the includeStephen Rothwell2011-03-151-1/+0
| * | | Cleanup: Factor out some cut-and-paste code.Rob Landley2011-03-111-111/+44
| * | | cleanup: save 60 lines/100 bytes by combining two mostly duplicate functions.Rob Landley2011-03-111-96/+33
| * | | NFS: account direct-io into task io accountingKonstantin Khlebnikov2011-03-111-0/+5
| * | | NFSv4: Send unmapped uid/gids to the server when using auth_sysTrond Myklebust2011-03-113-9/+46
| * | | NFSv4: Propagate the error NFS4ERR_BADOWNER to nfs4_do_setattrTrond Myklebust2011-03-112-2/+3
| * | | NFSv4: cleanup idmapper functions to take an nfs_server argumentTrond Myklebust2011-03-112-22/+20
| * | | NFSv4: Send unmapped uid/gids to the server if the idmapper failsTrond Myklebust2011-03-111-4/+26
| * | | NFSv4: If the server sends us a numeric uid/gid then accept itTrond Myklebust2011-03-111-2/+26
| * | | NFSv4.1: reject zero layout with zeroed stripe unitBenny Halevy2011-03-111-2/+2
| * | | NFSv4.1: Clear lseg pointer in ->doio functionFred Isaman2011-03-113-1/+4
| * | | NFSv4.1: rearrange ->doio argsFred Isaman2011-03-113-37/+43
| * | | NFSv4.1: pnfs filelayout driver writeFred Isaman2011-03-114-2/+126
| * | | NFSv4.1: remove GETATTR from ds writesFred Isaman2011-03-112-4/+10
| * | | NFSv4.1: implement generic pnfs layer write switchAndy Adamson2011-03-114-0/+45
| * | | NFSv4.1: trigger LAYOUTGET for writesFred Isaman2011-03-113-12/+49
| * | | NFSv4.1: Send lseg down into nfs_write_rpcsetupFred Isaman2011-03-111-2/+5
| * | | NFSv4.1: add callback to nfs4_write_doneFred Isaman2011-03-111-4/+10
| * | | NFSv4.1: rearrange nfs_write_rpcsetupAndy Adamson2011-03-111-36/+46
| * | | NFSv4.1: turn off pNFS on ds connection failureAndy Adamson2011-03-114-9/+36
| * | | NFSv4.1 move deviceid cache to filelayout driverChristoph Hellwig2011-03-115-263/+92
| * | | NFSv4.1: filelayout async error handlerAndy Adamson2011-03-115-6/+113
| * | | NFSv4.1: filelayout readAndy Adamson2011-03-115-2/+91
| * | | NFSv4.1: filelayout i/o helpersFred Isaman2011-03-113-0/+108
| * | | NFSv4.1: data server connectionAndy Adamson2011-03-115-2/+146
| * | | NFSv4.1: generic readAndy Adamson2011-03-113-25/+88
| * | | NFSv4.1: shift pnfs_update_layout locationsFred Isaman2011-03-116-35/+48
| * | | NFSv4.1: coelesce across layout stripesFred Isaman2011-03-116-2/+68
| * | | NFSv4.1: lseg refcountingFred Isaman2011-03-112-23/+59
| * | | NFSv4.1: add MDS mount DS only checkAndy Adamson2011-03-112-0/+17
| * | | NFSv4.1: new flag for lease time checkAndy Adamson2011-03-112-0/+14
| * | | NFSv4.1: new flag for state renewal checkAndy Adamson2011-03-112-5/+6
| * | | NFSv4.1: send zero stateid seqid on v4.1 i/oAndy Adamson2011-03-111-3/+7
| * | | NFS move nfs_client initialization into nfs_get_clientAndy Adamson2011-03-115-26/+42
| * | | NFSv4.1: put_layout_hdr can remove nfsi->layoutAndy Adamson2011-03-111-1/+1
| * | | NFS: change nfs_writeback_done to return voidFred Isaman2011-03-111-4/+4
| * | | NFS: remove pointless if statement in nfs_direct_write_resultFred Isaman2011-03-111-2/+1
| * | | pnfs: fix pnfs lock inversion of i_lock and cl_lockFred Isaman2011-03-112-18/+26
| * | | pnfs: do not need to clear NFS_LAYOUT_BULK_RECALL flagFred Isaman2011-03-111-2/+0