summaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2010-05-206-10/+9
|\
| * jbd2: use NULL instead of 0 when pointer is neededBill Pemberton2010-05-111-1/+1
| * fix "seperate" typos in commentsAnand Gadiyar2010-05-103-7/+7
| * Merge branch 'master' into for-nextJiri Kosina2010-04-23468-1378/+31182
| |\
| * | Fix typos in commentsThomas Weber2010-03-161-1/+1
| * | omfs: remove unused version.h includeHuang Weiyi2010-03-151-1/+0
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/raf...Linus Torvalds2010-05-201-0/+35
|\ \ \
| * | | FS / libfs: Implement simple_write_to_bufferJiri Slaby2010-05-101-0/+35
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2010-05-202-15/+0
|\ \ \ \
| * \ \ \ Merge branch 'next' into for-linusJames Morris2010-05-182-15/+0
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into nextJames Morris2010-05-06410-1074/+1778
| | |\ \ \ \
| | * | | | | security: remove dead hook inode_deleteEric Paris2010-04-121-2/+0
| | * | | | | security: remove dead hook sb_post_pivotrootEric Paris2010-04-121-1/+0
| | * | | | | security: remove dead hook sb_post_addmountEric Paris2010-04-121-2/+0
| | * | | | | security: remove dead hook sb_post_remountEric Paris2010-04-121-2/+0
| | * | | | | security: remove dead hook sb_umount_busyEric Paris2010-04-121-2/+0
| | * | | | | security: remove dead hook sb_umount_closeEric Paris2010-04-121-1/+0
| | * | | | | security: remove sb_check_sb hooksEric Paris2010-04-121-5/+0
* | | | | | | Merge branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2010-05-1912-304/+472
|\ \ \ \ \ \ \
| * | | | | | | Revert "nfsd4: distinguish expired from stale stateids"J. Bruce Fields2010-05-181-45/+11
| * | | | | | | nfsd: safer initialization order in find_file()Pavel Emelyanov2010-05-181-3/+3
| * | | | | | | nfs4: minor callback code simplification, commentJ. Bruce Fields2010-05-181-2/+8
| * | | | | | | NFSD: don't report compiled-out versions as presentPavel Emelyanov2010-05-141-1/+1
| * | | | | | | nfsd4: implement reclaim_completeJ. Bruce Fields2010-05-134-4/+52
| * | | | | | | nfsd4: nfsd4_destroy_session must set callback client under the state lockBenny Halevy2010-05-132-0/+3
| * | | | | | | nfsd4: keep a reference count on client while in useBenny Halevy2010-05-133-4/+27
| * | | | | | | nfsd4: mark_client_expiredBenny Halevy2010-05-132-1/+23
| * | | | | | | nfsd4: introduce nfs4_client.cl_refcountBenny Halevy2010-05-132-1/+5
| * | | | | | | nfsd4: refactor expire_clientBenny Halevy2010-05-111-11/+18
| * | | | | | | nfsd4: extend the client_lock to cover cl_lruBenny Halevy2010-05-111-15/+26
| * | | | | | | nfsd4: use list_move in move_to_confirmedBenny Halevy2010-05-111-2/+1
| * | | | | | | nfsd4: fold release_session into expire_clientBenny Halevy2010-05-111-10/+4
| * | | | | | | nfsd4: rename sessionid_lock to client_lockBenny Halevy2010-05-111-12/+14
| * | | | | | | nfsd4: fix bare destroy_session null dereferenceJ. Bruce Fields2010-05-071-2/+8
| * | | | | | | Merge commit 'v2.6.34-rc6'J. Bruce Fields2010-05-04503-3351/+31685
| |\ \ \ \ \ \ \
| * | | | | | | | nfsd4: use local variable in nfs4svc_encode_compoundresBenny Halevy2010-05-041-2/+2
| * | | | | | | | nfsd4: fix unlikely race in session replay caseJ. Bruce Fields2010-05-033-8/+10
| * | | | | | | | nfsd: potential ERR_PTR dereference on exp_export() error paths.Dan Carpenter2010-04-221-2/+2
| * | | | | | | | nfsd4: complete enforcement of 4.1 op orderingJ. Bruce Fields2010-04-222-14/+43
| * | | | | | | | nfsd4: allow 4.0 clients to change callback pathJ. Bruce Fields2010-04-223-14/+24
| * | | | | | | | nfsd4: rearrange cb data structuresJ. Bruce Fields2010-04-223-28/+28
| * | | | | | | | nfsd4: cl_count is unusedJ. Bruce Fields2010-04-223-17/+2
| * | | | | | | | nfsd4: don't sleep in lease-break callbackJ. Bruce Fields2010-04-223-20/+73
| * | | | | | | | nfsd4: indentation cleanupJ. Bruce Fields2010-04-191-3/+2
| * | | | | | | | nfsd4: consistent session flag settingJ. Bruce Fields2010-04-161-6/+6
| * | | | | | | | nfsd4: remove probe task's reference on clientJ. Bruce Fields2010-04-021-8/+1
| * | | | | | | | nfsd4: remove dprintkJ. Bruce Fields2010-04-021-3/+0
| * | | | | | | | nfsd4: shutdown callbacks on expiryJ. Bruce Fields2010-04-021-3/+3
| * | | | | | | | nfsd4: preallocate nfs4_rpc_argsJ. Bruce Fields2010-04-022-15/+13
| * | | | | | | | nfsd: don't break lease while servicing a COMMITJeff Layton2010-03-222-3/+6