aboutsummaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'v3.0-rc7' into android-3.0Colin Cross2011-07-1217-97/+184
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6Linus Torvalds2011-07-113-57/+73
| |\
| | * cifs: drop spinlock before calling cifs_put_tlinkJeff Layton2011-07-111-1/+1
| | * cifs: fix expand_dfs_referralJeff Layton2011-07-091-10/+20
| | * cifs: move bdi_setup_and_register outside of CONFIG_CIFS_DFS_UPCALLJeff Layton2011-07-091-0/+2
| | * cifs: factor smb_vol allocation out of cifs_setup_volume_infoJeff Layton2011-07-083-33/+33
| | * cifs: have cifs_cleanup_volume_info not take a double pointerJeff Layton2011-07-063-9/+5
| | * cifs: fix build_unc_path_to_root to account for a prefixpathJeff Layton2011-07-061-6/+15
| | * cifs: remove bogus call to cifs_cleanup_volume_infoJeff Layton2011-07-061-1/+0
| * | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2011-07-084-6/+20
| |\ \
| | * | btrfs: fix oops when doing space balanceMiao Xie2011-07-061-5/+7
| | * | Btrfs: don't panic if we get an error while balancing V2Josef Bacik2011-07-061-1/+2
| | * | btrfs: add missing options displayed in mount outputDavid Sterba2011-07-062-0/+11
| * | | Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfsLinus Torvalds2011-07-082-8/+10
| |\ \ \
| | * | | xfs: unpin stale inodes directly in IOP_COMMITTEDDave Chinner2011-07-062-8/+10
| * | | | FS-Cache: Add a helper to bulk uncache pages on an inodeDavid Howells2011-07-073-5/+48
| | |_|/ | |/| |
| * | | FDPIC: Fix memory leakDavidlohr Bueso2011-07-061-0/+1
| * | | fs: fix lock initializationMiklos Szeredi2011-07-061-10/+20
| * | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2011-07-051-8/+6
| |\ \ \
| | * | | ceph: fix sync and dio writes across stripe boundariesSage Weil2011-06-131-3/+3
| | * | | ceph: fix page alignment correctionsSage Weil2011-06-131-5/+3
| * | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hch...Linus Torvalds2011-07-052-3/+6
| |\ \ \ \
| | * | | | hfsplus: Fix double iput of the same inode in hfsplus_fill_super()Alexey Khoroshilov2011-06-301-1/+1
| | * | | | hfsplus: add missing call to bio_put()Seth Forshee2011-06-301-2/+5
* | | | | | Merge commit 'v3.0-rc6' into android-3.0Dima Zavin2011-07-072-10/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | cifs: set socket send and receive timeouts before attempting connectJeff Layton2011-07-011-8/+8
| |/ / / /
| * | | | proc: restrict access to /proc/PID/ioVasiliy Kulikov2011-06-281-2/+5
* | | | | Merge commit 'v3.0-rc5' into android-3.0Colin Cross2011-06-2984-966/+1060
|\ \ \ \ \ | |/ / / /
| * | | | mm: fix assertion mapping->nrpages == 0 in end_writeback()Jan Kara2011-06-271-0/+7
| * | | | romfs: fix romfs_get_unmapped_area() argument checkBob Liu2011-06-271-2/+6
| * | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2011-06-275-31/+100
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | btrfs: fix inconsonant inode informationMiao Xie2011-06-273-26/+91
| | * | | Btrfs: make sure to update total_bitmaps when freeing cache V3Josef Bacik2011-06-251-3/+6
| | * | | Btrfs: fix type mismatch in find_free_extent()Ilya Dryomov2011-06-251-2/+2
| | * | | Btrfs: make sure to record the transid in new inodesChris Mason2011-06-241-0/+1
| * | | | Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfsLinus Torvalds2011-06-274-6/+31
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | xfs: prevent bogus assert when trying to remove non-existent attributeDave Chinner2011-06-231-0/+7
| | * | | xfs: clear XFS_IDIRTY_RELEASE on truncate downDave Chinner2011-06-231-2/+5
| | * | | xfs: reset inode per-lifetime state when recycling itDave Chinner2011-06-232-4/+19
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6Linus Torvalds2011-06-262-5/+3
| |\ \ \ \
| | * | | | cifs: mark CONFIG_CIFS_NFSD_EXPORT as BROKENJeff Layton2011-06-241-1/+1
| | * | | | cifs: free blkcipher in smbhashJeff Layton2011-06-241-4/+2
| * | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2011-06-264-116/+98
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | cifs: propagate errors from cifs_get_root() to mount(2)Al Viro2011-06-241-7/+5
| | * | | | cifs: tidy cifs_do_mount() up a bitAl Viro2011-06-241-22/+22
| | * | | | cifs: more breakage on mount failuresAl Viro2011-06-241-7/+4
| | * | | | cifs: close sget() racesAl Viro2011-06-241-3/+9
| | * | | | cifs: pull freeing mountdata/dropping nls/freeing cifs_sb into cifs_umount()Al Viro2011-06-242-14/+4
| | * | | | cifs: move cifs_umount() call into ->kill_sb()Al Viro2011-06-241-18/+1
| | * | | | cifs: pull cifs_mount() call upAl Viro2011-06-241-12/+15