summaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nfs-for-3.2' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2011-11-0413-852/+347
|\
| * nfs: set vs_hidden on nfs4_callback_version4 (try #2)Jeff Layton2011-11-041-0/+1
| * Merge branch 'osd-devel' into nfs-for-nextTrond Myklebust2011-11-02192-8095/+10003
| |\
| | * pnfs-obj: Support for RAID5 read-4-write interface.Boaz Harrosh2011-11-021-0/+38
| | * pnfs-obj: move to ore 03: Remove old raid engineBoaz Harrosh2011-11-021-504/+0
| | * pnfs-obj: move to ore 02: move to OREBoaz Harrosh2011-11-022-75/+60
| | * pnfs-obj: move to ore 01: ore_layout & ore_componentsBoaz Harrosh2011-11-021-144/+128
| | * pnfs-obj: Rename objlayout_io_state => objlayout_io_resBoaz Harrosh2011-11-023-47/+48
| | * pnfs-obj: Get rid of objlayout_{alloc,free}_io_stateBoaz Harrosh2011-11-023-142/+112
| | * pnfs-obj: Return PNFS_NOT_ATTEMPTED in case of read/write_pagelistBoaz Harrosh2011-11-023-35/+37
| | * pnfs-obj: Remove redundant EOF from objlayout_io_stateBoaz Harrosh2011-11-022-10/+7
| * | nfs: Remove unused variable from write.cRakib Mullick2011-11-021-2/+1
| * | nfs: Fix unused variable warning from file.cRakib Mullick2011-11-021-6/+3
| * | NFS: Remove no-op less-than-zero checks on unsigned variables.Chuck Lever2011-10-311-4/+3
| * | NFS: Clean up nfs4_xdr_dec_secinfo()Chuck Lever2011-10-311-2/+0
| * | NFS: Fix documenting comment for nfs_create_request()Chuck Lever2011-10-311-1/+1
| * | NFS4: fix cb_recallany decode errorPeng Tao2011-10-311-5/+6
| * | nfs4: serialize layoutcommitPeng Tao2011-10-312-3/+28
| * | NFSd: call svc rpcbind cleanup explicitlyStanislav Kinsbursky2011-10-251-0/+2
* | | Merge git://git.samba.org/sfrench/cifs-2.6Linus Torvalds2011-11-037-64/+32
|\ \ \
| * | | cifs: Assume passwords are encoded according to iocharset (try #2)Shirish Pargaonkar2011-10-295-60/+23
| * | | CIFS: Fix the VFS brlock cache usage in posix locking casePavel Shilovsky2011-10-291-2/+8
| * | | [CIFS] Update cifs version to 1.76Steve French2011-10-281-1/+1
| * | | CIFS: Remove extra mutex_unlock in cifs_lock_add_ifPavel Shilovsky2011-10-281-1/+0
* | | | Merge branch 'for-3.2' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2011-11-021-1/+1
|\ \ \ \
| * | | | nfsd4: typo logical vs bitwise negate in nfsd4_decode_share_accessBenny Halevy2011-11-011-1/+1
* | | | | Merge branch 'akpm' (Andrew's incoming - part two)Linus Torvalds2011-11-027-89/+290
|\ \ \ \ \
| * | | | | aio: allocate kiocbs in batchesJeff Moyer2011-11-021-29/+107
| * | | | | sysctl: add support for poll()Lucas De Marchi2011-11-021-0/+45
| * | | | | proc: fix races against execve() of /proc/PID/fd**Vasiliy Kulikov2011-11-021-43/+103
| * | | | | procfs: report EISDIR when reading sysctl dirs in procPavel Emelyanov2011-11-021-0/+1
| * | | | | hfs: fix hfs_find_init() sb->ext_tree NULL ptr oopsPhillip Lougher2011-11-021-5/+15
| * | | | | isofs: add readpages supportNamjae Jeon2011-11-021-1/+9
| * | | | | ramfs: remove module leftoversRichard Weinberger2011-11-021-10/+0
| * | | | | binfmt_elf: fix PIE execution with randomization disabledJiri Kosina2011-11-021-1/+10
| | |_|_|/ | |/| | |
* | | | | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/...Linus Torvalds2011-11-02100-221/+262
|\ \ \ \ \
| * | | | | vfs: add d_prune dentry operationSage Weil2011-11-021-5/+35
| * | | | | vfs: protect i_nlinkMiklos Szeredi2011-11-021-1/+1
| * | | | | filesystems: add set_nlink()Miklos Szeredi2011-11-0278-146/+148
| * | | | | filesystems: add missing nlink wrappersMiklos Szeredi2011-11-0229-55/+52
| * | | | | logfs: remove unnecessary nlink settingMiklos Szeredi2011-11-021-1/+0
| * | | | | ocfs2: remove unnecessary nlink settingMiklos Szeredi2011-11-021-2/+0
| * | | | | jfs: remove unnecessary nlink settingMiklos Szeredi2011-11-021-1/+0
| * | | | | vfs: ignore error on forced remountMiklos Szeredi2011-11-021-2/+7
| * | | | | readlinkat: ensure we return ENOENT for the empty pathname for normal lookupsAndy Whitcroft2011-11-022-7/+16
| * | | | | vfs: fix dentry leak in simple_fill_super()Konstantin Khlebnikov2011-11-021-1/+3
| |/ / / /
* | | | | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tyt...Linus Torvalds2011-11-0226-1159/+2328
|\ \ \ \ \
| * | | | | jbd2: Unify log messages in jbd2 codeEryu Guan2011-11-014-47/+47
| * | | | | jbd/jbd2: validate sb->s_first in journal_get_superblock()Eryu Guan2011-11-012-0/+16
| * | | | | ext4: let ext4_ext_rm_leaf work with EXT_DEBUG definedYongqiang Yang2011-11-011-1/+1