summaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/t...Linus Torvalds2014-01-285-28/+22
|\
| * ext4: delete "set but not used" variablesjon ernst2014-01-112-7/+1
| * ext4: don't pass freed handle to ext4_walk_page_buffersTheodore Ts'o2014-01-071-1/+1
| * ext4: avoid clearing beyond i_blocks when truncating an inline data fileTheodore Ts'o2014-01-071-3/+5
| * ext4: ext4_inode_is_fast_symlink should use EXT4_CLUSTER_SIZEYongqiang Yang2014-01-061-2/+2
| * ext4: fix a typo in extents.cYongqiang Yang2014-01-061-1/+1
| * ext4: use %pd printk specificerDavid Howells2014-01-061-3/+2
| * ext4: standardize error handling in ext4_da_write_inline_data_begin()Jan Kara2014-01-061-7/+4
| * ext4: retry allocation when inline->extent conversion failedJan Kara2014-01-061-0/+7
| * ext4: enable punch hole for bigallocZheng Liu2014-01-061-5/+0
* | Merge tag 'nfs-for-3.14-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2014-01-2815-257/+359
|\ \
| * | pnfs: Proper delay for NFS4ERR_RECALLCONFLICT in layout_get_doneBoaz Harrosh2014-01-221-4/+30
| * | pnfs: fix BUG in filelayout_recover_commit_reqsWeston Andros Adamson2014-01-211-4/+4
| * | nfs4: fix discover_server_trunking use after freeWeston Andros Adamson2014-01-201-6/+4
| * | NFSv4.1: Handle errors correctly in nfs41_walk_client_listTrond Myklebust2014-01-191-3/+5
| * | nfs: always make sure page is up-to-date before extending a write to cover th...Scott Mayhew2014-01-171-5/+6
| * | nfs: page cache invalidation for dioChristoph Hellwig2014-01-131-2/+27
| * | nfs: take i_mutex during direct I/O readsChristoph Hellwig2014-01-131-2/+12
| * | nfs: merge nfs_direct_write into nfs_file_direct_writeChristoph Hellwig2014-01-131-50/+41
| * | nfs: merge nfs_direct_read into nfs_file_direct_readChristoph Hellwig2014-01-131-58/+49
| * | nfs: increment i_dio_count for reads, tooChristoph Hellwig2014-01-131-3/+6
| * | nfs: defer inode_dio_done call until size update is doneChristoph Hellwig2014-01-131-17/+15
| * | nfs: fix size updates for aio writesChristoph Hellwig2014-01-131-5/+16
| * | nfs4.1: properly handle ENOTSUP in SECINFO_NO_NAMEWeston Andros Adamson2014-01-131-2/+2
| * | NFSv4.1: Fix a race in nfs4_write_inodeTrond Myklebust2014-01-132-43/+38
| * | NFSv4.1: Don't trust attributes if a pNFS LAYOUTCOMMIT is outstandingTrond Myklebust2014-01-133-5/+35
| * | point to the right include file in a comment (left over from a9004abc3)Toralf Förster2014-01-051-2/+2
| * | NFS: dprintk() should not print negative fileids and inode numbersNiels de Vos2014-01-058-44/+45
| * | nfs: fix dead code of ipv6_addr_scopeAlexander Aring2014-01-051-1/+1
| * | nfs: check if gssd is running before attempting to use krb5i auth in SETCLIEN...Jeff Layton2013-12-061-1/+6
| * | NFSv4: OPEN must handle the NFS4ERR_IO return code correctlyTrond Myklebust2013-12-061-16/+31
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2014-01-28164-3702/+1429
|\ \ \
| * | | __dentry_path() fixesAl Viro2014-01-261-3/+6
| * | | vfs: Remove second variable named error in __dentry_pathEric W. Biederman2014-01-261-1/+0
| * | | vfs: Is mounted should be testing mnt_ns for NULL or error.Eric W. Biederman2014-01-261-1/+1
| * | | Fix race when checking i_size on direct i/o readSteven Whitehouse2014-01-261-0/+3
| * | | hfsplus: remove can_set_xattrChristoph Hellwig2014-01-261-84/+3
| * | | nfsd: use get_acl and ->set_aclChristoph Hellwig2014-01-267-347/+173
| * | | fs: remove generic_aclChristoph Hellwig2014-01-264-190/+37
| * | | nfs: use generic posix ACL infrastructure for v3 Posix ACLsChristoph Hellwig2014-01-264-264/+110
| * | | gfs2: use generic posix ACL infrastructureChristoph Hellwig2014-01-254-214/+62
| * | | jfs: use generic posix ACL infrastructureChristoph Hellwig2014-01-257-140/+89
| * | | xfs: use generic posix ACL infrastructureChristoph Hellwig2014-01-255-171/+36
| * | | reiserfs: use generic posix ACL infrastructureChristoph Hellwig2014-01-255-161/+35
| * | | ocfs2: use generic posix ACL infrastructureChristoph Hellwig2014-01-257-250/+72
| * | | jffs2: use generic posix ACL infrastructureChristoph Hellwig2014-01-257-143/+24
| * | | hfsplus: use generic posix ACL infrastructureChristoph Hellwig2014-01-256-162/+26
| * | | f2fs: use generic posix ACL infrastructureChristoph Hellwig2014-01-257-170/+31
| * | | ext2/3/4: use generic posix ACL infrastructureChristoph Hellwig2014-01-2521-605/+100
| * | | btrfs: use generic posix ACL infrastructureChristoph Hellwig2014-01-255-135/+28