summaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://github.com/ericvh/linuxLinus Torvalds2011-10-263-17/+32
|\
| * net/9p: Convert net/9p protocol dumps to tracepointsAneesh Kumar K.V2011-10-241-7/+5Star
| * fs/9p: Cleanup option parsing in 9pAneesh Kumar K.V2011-10-241-7/+26
| * fs/9p: inode file operation is properly initialized init_special_inodeAneesh Kumar K.V2011-10-241-2/+0Star
| * fs/9p: Update zero-copy implementation in 9pAneesh Kumar K.V2011-10-241-1/+1
* | Merge branch 'nfs-for-3.2' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2011-10-2517-273/+202Star
|\ \
| * | Check validity of cl_rpcclient in nfs_server_list_showMalahal Naineni2011-10-211-0/+4
| * | NFS: Get rid of the nfs_rdata_mempoolTrond Myklebust2011-10-191-13/+4Star
| * | NFS: Don't rely on PageError in nfs_readpage_release_partialTrond Myklebust2011-10-191-5/+2Star
| * | NFS: Get rid of unnecessary calls to ClearPageError() in read codeTrond Myklebust2011-10-192-3/+0Star
| * | NFS: Get rid of nfs_restart_rpc()Trond Myklebust2011-10-196-33/+16Star
| * | NFSv4: Translate NFS4ERR_BADNAME into ENOENT when applied to a lookupTrond Myklebust2011-10-191-1/+9
| * | NFS: Remove the unused "lookupfh()" version of nfs4_proc_lookup()Trond Myklebust2011-10-191-45/+17Star
| * | NFS: Use the inode->i_version to cache NFSv4 change attribute informationTrond Myklebust2011-10-185-14/+14
| * | nfs/super.c: local functions should be staticH Hartley Sweeten2011-10-181-6/+11
| * | pnfsblock: fix writeback deadlockPeng Tao2011-10-181-2/+6
| * | pnfsblock: fix NULL pointer dereferencePeng Tao2011-10-181-0/+3
| * | pnfs: recoalesce when ld read pagelist failsPeng Tao2011-10-183-15/+19
| * | pnfs: recoalesce when ld write pagelist failsPeng Tao2011-10-183-15/+32
| * | pnfs: make _set_lo_fail genericPeng Tao2011-10-184-30/+19Star
| * | pnfsblock: add missing rpc_put_mount and path_putPeng Tao2011-10-181-2/+6
| * | SUNRPC/NFS: make rpc pipe upcall genericPeng Tao2011-10-184-49/+2Star
| * | pnfsblock: fix size of upcall messageJim Rees2011-10-181-1/+1
| * | pnfsblock: fix return code confusionJim Rees2011-10-182-13/+20
| * | nfs: don't try to migrate pages with active requestsJeff Layton2011-10-181-25/+11Star
| * | nfs: fix bug about IPv6 address scope checkingMi Jinlong2011-10-181-3/+4
| * | nfs: don't redirty inode when ncommit == 0 in nfs_commit_unstable_pagesJeff Layton2011-10-181-0/+4
| * | Revert "NFS: Ensure that writeback_single_inode() calls write_inode() when sy...Trond Myklebust2011-10-181-1/+2
| |/
* | Merge branch 'for-3.2' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2011-10-2520-1464/+1794
|\ \
| * | nfs41: implement DESTROY_CLIENTID operationMi Jinlong2011-10-244-2/+61
| * | nfsd4: typo logical vs bitwise negate for want_maskBenny Halevy2011-10-241-1/+1
| * | nfsd4: allow NFS4_SHARE_SIGNAL_DELEG_WHEN_RESRC_AVAIL | NFS4_SHARE_PUSH_DELEG...Benny Halevy2011-10-241-0/+2
| * | nfsd4: seq->status_flags may be used unitializedBenny Halevy2011-10-241-2/+4
| * | nfsd41: use SEQ4_STATUS_BACKCHANNEL_FAULT when cb_sequence is invalidBenny Halevy2011-10-243-1/+18
| * | nfsd4: implement new 4.1 open reclaim typesJ. Bruce Fields2011-10-193-14/+24
| * | nfsd4: remove unneeded CLAIM_DELEGATE_CUR workaroundJ. Bruce Fields2011-10-191-6/+0Star
| * | nfsd4: warn on open failure after createJ. Bruce Fields2011-10-174-6/+8
| * | nfsd4: preallocate open stateid in process_open1()J. Bruce Fields2011-10-172-29/+21Star
| * | nfsd4: do idr preallocation with stateid allocationJ. Bruce Fields2011-10-172-41/+39Star
| * | nfsd4: preallocate nfs4_file in process_open1()J. Bruce Fields2011-10-172-24/+37
| * | nfsd4: clean up open owners on OPEN failureJ. Bruce Fields2011-10-174-2/+21
| * | nfsd4: simplify process_open1 logicJ. Bruce Fields2011-10-171-14/+8Star
| * | nfsd4: make is_open_owner booleanJ. Bruce Fields2011-10-171-1/+1
| * | nfsd4: centralize renew_client() callsJ. Bruce Fields2011-10-171-13/+10Star
| * | nfsd4: typo logical vs bitwise negateDan Carpenter2011-10-171-1/+1
| * | nfs: fix bug about IPv6 address scope checkingMi Jinlong2011-10-121-3/+4
| * | nfsd4: more robust ignoring of WANT bits in OPENJ. Bruce Fields2011-10-112-3/+5
| * | nfsd4: move name-length checks to xdrJ. Bruce Fields2011-10-113-39/+33Star
| * | nfsd4: move access/deny validity checks to xdr codeJ. Bruce Fields2011-10-112-39/+73
| * | nfsd4: ignore WANT bits in open downgradeJ. Bruce Fields2011-10-111-0/+2