summaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tei...Linus Torvalds2009-01-0512-130/+316
|\
| * dlm: fs/dlm/ast.c: fix warningAndrew Morton2008-12-231-22/+17
| * dlm: add new debugfs entryDavid Teigland2008-12-232-50/+247
| * dlm: add time stamp of blocking callbackDavid Teigland2008-12-232-0/+3
| * dlm: change lock time stampingDavid Teigland2008-12-234-19/+19
| * dlm: improve how bast mode handlingDavid Teigland2008-12-235-15/+17
| * dlm: remove extra blocking callback checkDavid Teigland2008-12-231-6/+1
| * dlm: replace schedule with cond_reschedSteven Whitehouse2008-12-231-1/+1
| * dlm: remove kmap/kunmapSteven Whitehouse2008-12-231-7/+0
| * dlm: trivial annotation of be16 valueHarvey Harrison2008-12-231-9/+9
| * dlm: fix up memory allocation flagsSteven Whitehouse2008-12-233-4/+5
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmwLinus Torvalds2009-01-0542-1084/+961
|\ \
| * | GFS2: Use DEFINE_SPINLOCKJulia Lawall2009-01-051-1/+1
| * | GFS2: Fix use-after-free bug on umount (try #2)Steven Whitehouse2009-01-052-9/+12
| * | Revert "GFS2: Fix use-after-free bug on umount"Steven Whitehouse2009-01-056-94/+114
| * | GFS2: Streamline alloc calculations for writesSteven Whitehouse2009-01-054-49/+42
| * | GFS2: Send useful information with uevent messagesSteven Whitehouse2009-01-051-2/+10
| * | GFS2: Fix use-after-free bug on umountSteven Whitehouse2009-01-056-114/+94
| * | GFS2: Remove ancient, unused codeSteven Whitehouse2009-01-053-18/+0
| * | GFS2: Move four functions from super.cSteven Whitehouse2009-01-055-168/+167
| * | GFS2: Fix bug in gfs2_lock_fs_check_clean()Steven Whitehouse2009-01-054-75/+68
| * | GFS2: Send some sensible sysfs stuffSteven Whitehouse2009-01-052-2/+30
| * | GFS2: Kill two daemons with one patchSteven Whitehouse2009-01-0513-341/+130
| * | GFS2: Move gfs2_recoverd into recovery.cSteven Whitehouse2009-01-056-43/+45
| * | GFS2: Fix "truncate in progress" hangSteven Whitehouse2009-01-057-7/+75
| * | GFS2: Clean up & move gfs2_quotadSteven Whitehouse2009-01-059-69/+84
| * | GFS2: Add more detail to debugfs glock dumpsSteven Whitehouse2009-01-051-3/+8
| * | GFS2: Banish struct gfs2_rgrpd_hostSteven Whitehouse2009-01-053-21/+13
| * | GFS2: Move rg_free from gfs2_rgrpd_host to gfs2_rgrpdSteven Whitehouse2009-01-053-16/+16
| * | GFS2: Move rg_igeneration into struct gfs2_rgrpdSteven Whitehouse2009-01-052-4/+4
| * | GFS2: Banish struct gfs2_dinode_hostSteven Whitehouse2009-01-0512-48/+38
| * | GFS2: Move i_size from gfs2_dinode_host and rename it to i_disksizeSteven Whitehouse2009-01-0511-55/+56
| * | GFS2: Move di_eattr into "proper" inodeSteven Whitehouse2009-01-055-20/+20
| * | GFS2: Move "entries" into "proper" inodeSteven Whitehouse2009-01-054-24/+23
| * | GFS2: Move generation number into "proper" part of inodeSteven Whitehouse2009-01-052-3/+3
| * | GFS2: sparse annotation of gl->gl_spinHarvey Harrison2009-01-051-0/+8
| * | GFS2: Fix up jdata writepage/delete_inodeSteven Whitehouse2009-01-052-12/+11
| * | GFS2: Rationalise header filesSteven Whitehouse2009-01-0514-90/+23
| * | GFS2: Support for FIEMAP ioctlSteven Whitehouse2009-01-052-10/+80
* | | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2009-01-0563-3046/+9587
|\ \ \
| * | | ocfs2: Access the right buffer_head in ocfs2_merge_rec_left.Tao Ma2009-01-051-2/+2
| * | | ocfs2: use min_t in ocfs2_quota_read()Mark Fasheh2009-01-051-1/+1
| * | | ocfs2: remove unneeded lvb castsMark Fasheh2009-01-051-7/+5
| * | | ocfs2: Add xattr support checking in init_securityTiger Yang2009-01-051-0/+3
| * | | ocfs2: alloc xattr bucket in ocfs2_xattr_set_handleTiger Yang2009-01-051-3/+15
| * | | ocfs2: calculate and reserve credits for xattr value in mknodTiger Yang2009-01-051-14/+26
| * | | ocfs2/xattr: fix credits calculation during index createTao Ma2009-01-051-1/+9
| * | | ocfs2/xattr: Always updating ctime during xattr set.Tao Ma2009-01-051-4/+16
| * | | ocfs2/xattr: Remove extend_trans call and add its credits from the beginningTao Ma2009-01-051-13/+10
| * | | ocfs2/dlm: Fix race during lockres masterySunil Mushran2009-01-051-1/+8
OpenPOWER on IntegriCloud