aboutsummaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAge
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tei...Linus Torvalds2009-01-05
|\
| * dlm: fs/dlm/ast.c: fix warningAndrew Morton2008-12-23
| * dlm: add new debugfs entryDavid Teigland2008-12-23
| * dlm: add time stamp of blocking callbackDavid Teigland2008-12-23
| * dlm: change lock time stampingDavid Teigland2008-12-23
| * dlm: improve how bast mode handlingDavid Teigland2008-12-23
| * dlm: remove extra blocking callback checkDavid Teigland2008-12-23
| * dlm: replace schedule with cond_reschedSteven Whitehouse2008-12-23
| * dlm: remove kmap/kunmapSteven Whitehouse2008-12-23
| * dlm: trivial annotation of be16 valueHarvey Harrison2008-12-23
| * dlm: fix up memory allocation flagsSteven Whitehouse2008-12-23
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmwLinus Torvalds2009-01-05
|\ \
| * | GFS2: Use DEFINE_SPINLOCKJulia Lawall2009-01-05
| * | GFS2: Fix use-after-free bug on umount (try #2)Steven Whitehouse2009-01-05
| * | Revert "GFS2: Fix use-after-free bug on umount"Steven Whitehouse2009-01-05
| * | GFS2: Streamline alloc calculations for writesSteven Whitehouse2009-01-05
| * | GFS2: Send useful information with uevent messagesSteven Whitehouse2009-01-05
| * | GFS2: Fix use-after-free bug on umountSteven Whitehouse2009-01-05
| * | GFS2: Remove ancient, unused codeSteven Whitehouse2009-01-05
| * | GFS2: Move four functions from super.cSteven Whitehouse2009-01-05
| * | GFS2: Fix bug in gfs2_lock_fs_check_clean()Steven Whitehouse2009-01-05
| * | GFS2: Send some sensible sysfs stuffSteven Whitehouse2009-01-05
| * | GFS2: Kill two daemons with one patchSteven Whitehouse2009-01-05
| * | GFS2: Move gfs2_recoverd into recovery.cSteven Whitehouse2009-01-05
| * | GFS2: Fix "truncate in progress" hangSteven Whitehouse2009-01-05
| * | GFS2: Clean up & move gfs2_quotadSteven Whitehouse2009-01-05
| * | GFS2: Add more detail to debugfs glock dumpsSteven Whitehouse2009-01-05
| * | GFS2: Banish struct gfs2_rgrpd_hostSteven Whitehouse2009-01-05
| * | GFS2: Move rg_free from gfs2_rgrpd_host to gfs2_rgrpdSteven Whitehouse2009-01-05
| * | GFS2: Move rg_igeneration into struct gfs2_rgrpdSteven Whitehouse2009-01-05
| * | GFS2: Banish struct gfs2_dinode_hostSteven Whitehouse2009-01-05
| * | GFS2: Move i_size from gfs2_dinode_host and rename it to i_disksizeSteven Whitehouse2009-01-05
| * | GFS2: Move di_eattr into "proper" inodeSteven Whitehouse2009-01-05
| * | GFS2: Move "entries" into "proper" inodeSteven Whitehouse2009-01-05
| * | GFS2: Move generation number into "proper" part of inodeSteven Whitehouse2009-01-05
| * | GFS2: sparse annotation of gl->gl_spinHarvey Harrison2009-01-05
| * | GFS2: Fix up jdata writepage/delete_inodeSteven Whitehouse2009-01-05
| * | GFS2: Rationalise header filesSteven Whitehouse2009-01-05
| * | GFS2: Support for FIEMAP ioctlSteven Whitehouse2009-01-05
* | | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2009-01-05
|\ \ \
| * | | ocfs2: Access the right buffer_head in ocfs2_merge_rec_left.Tao Ma2009-01-05
| * | | ocfs2: use min_t in ocfs2_quota_read()Mark Fasheh2009-01-05
| * | | ocfs2: remove unneeded lvb castsMark Fasheh2009-01-05
| * | | ocfs2: Add xattr support checking in init_securityTiger Yang2009-01-05
| * | | ocfs2: alloc xattr bucket in ocfs2_xattr_set_handleTiger Yang2009-01-05
| * | | ocfs2: calculate and reserve credits for xattr value in mknodTiger Yang2009-01-05
| * | | ocfs2/xattr: fix credits calculation during index createTao Ma2009-01-05
| * | | ocfs2/xattr: Always updating ctime during xattr set.Tao Ma2009-01-05
| * | | ocfs2/xattr: Remove extend_trans call and add its credits from the beginningTao Ma2009-01-05
| * | | ocfs2/dlm: Fix race during lockres masterySunil Mushran2009-01-05