summaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfsLinus Torvalds2011-01-1523-482/+729
|\
| * xfs: prevent NMI timeouts in cmn_errDave Chinner2011-01-127-114/+96Star
| * xfs: Add log level to assertion printkAnton Blanchard2011-01-121-1/+2
| * xfs: fix an assignment within an ASSERT()Jesper Juhl2011-01-121-1/+1
| * xfs: fix error handling for synchronous writesChristoph Hellwig2011-01-123-114/+51Star
| * xfs: add FITRIM supportChristoph Hellwig2011-01-127-12/+259
| * xfs: ensure log covering transactions are synchronousDave Chinner2011-01-124-12/+13
| * xfs: serialise unaligned direct IOsDave Chinner2011-01-111-10/+28
| * xfs: factor common write setup codeDave Chinner2011-01-111-67/+56Star
| * xfs: split buffered IO write path from xfs_file_aio_writeDave Chinner2011-01-111-77/+69Star
| * xfs: split direct IO write path from xfs_file_aio_writeDave Chinner2011-01-111-63/+116
| * xfs: introduce xfs_rw_lock() helpers for locking the inodeDave Chinner2011-01-121-51/+80
| * xfs: factor post-write newsize updatesDave Chinner2011-01-111-22/+21Star
| * xfs: factor common post-write isize handling codeDave Chinner2011-01-111-26/+28
| * xfs: ensure sync write errors are returnedDave Chinner2011-01-111-26/+23Star
* | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2011-01-141-18/+75
|\ \
| * | block: restore multiple bd_link_disk_holder() supportTejun Heo2011-01-141-18/+75
* | | Turn d_set_d_op() BUG_ON() into WARN_ON_ONCE()Linus Torvalds2011-01-141-2/+2
* | | Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2011-01-1419-277/+573
|\ \ \
| * | | nfsd4: fix callback restartingJ. Bruce Fields2011-01-141-12/+9Star
| * | | nfsd: break lease on unlink, link, and renameJ. Bruce Fields2011-01-141-4/+23
| * | | nfsd4: break lease on nfsd setattrJ. Bruce Fields2011-01-141-8/+4Star
| * | | nfsd: don't support msnfs export optionJ. Bruce Fields2011-01-142-43/+2Star
| * | | nfsd4: initialize cb_per_clientJ. Bruce Fields2011-01-141-0/+1
| * | | nfsd4: allow restarting callbacksJ. Bruce Fields2011-01-113-6/+32
| * | | nfsd4: simplify nfsd4_cb_prepareJ. Bruce Fields2011-01-111-22/+4Star
| * | | nfsd4: give out delegations more quickly in 4.1 caseJ. Bruce Fields2011-01-111-2/+15
| * | | nfsd4: add helper function to run callbacksJ. Bruce Fields2011-01-111-2/+7
| * | | nfsd4: make sure sequence flags are set after destroy_sessionJ. Bruce Fields2011-01-113-2/+8
| * | | nfsd4: re-probe callback on connection lossJ. Bruce Fields2011-01-111-1/+1
| * | | nfsd4: set sequence flag when backchannel is downJ. Bruce Fields2011-01-113-8/+8
| * | | nfsd4: keep finer-grained callback statusJ. Bruce Fields2011-01-113-17/+22
| * | | nfsd4: allow backchannel recoveryJ. Bruce Fields2011-01-112-9/+43
| * | | nfsd4: support BIND_CONN_TO_SESSIONJ. Bruce Fields2011-01-115-10/+99
| * | | nfsd4: modify session list under cl_lockJ. Bruce Fields2011-01-111-0/+6
| * | | Merge commit 'v2.6.37' into for-2.6.38-incomingJ. Bruce Fields2011-01-1120-87/+188
| |\ \ \
| * | | | nfs4: set source address when callback is generatedTakuma Umeya2011-01-053-3/+21
| * | | | nfsd4: return nfs errno from name_to_id functionsJ. Bruce Fields2011-01-054-14/+14
| * | | | nfsd4: remove outdated pathname-commentsJ. Bruce Fields2011-01-052-4/+0Star
| * | | | nfsd4: move idmap and acl header files into fs/nfsdJ. Bruce Fields2011-01-057-7/+133
| * | | | nfsd4: name->id mapping should fail with BADOWNER not BADNAMEJ. Bruce Fields2011-01-053-3/+4
| * | | | locks: minor setlease cleanupJ. Bruce Fields2011-01-041-1/+1
| * | | | locks: eliminate fl_mylease callbackJ. Bruce Fields2011-01-042-27/+2Star
| * | | | nfsd4: use a single struct file for delegationsJ. Bruce Fields2011-01-042-5/+6
| * | | | nfsd4: eliminate lease delete callbackJ. Bruce Fields2011-01-041-18/+0Star
| * | | | nfsd: remove some unnecessary dropit handlingJ. Bruce Fields2011-01-044-12/+0Star
| * | | | nfsd: stop translating EAGAIN to nfserr_dropitJ. Bruce Fields2011-01-041-1/+2
| * | | | svcrpc: simpler request droppingJ. Bruce Fields2011-01-041-1/+1
| * | | | nfsd: don't drop requests on -ENOMEMJ. Bruce Fields2011-01-041-1/+1
| * | | | nfsd: declare several functions of nfs4callback as staticKirill A. Shutemov2011-01-041-3/+4