)]}' { "log": [ { "commit": "a2724f28d9f99b7b42e800b528902f0e3321873b", "tree": "b4431876af950c16ea6af3a8f2864a4ae494bc62", "parents": [ "050026feae5bd4fe2db4096b63b15abce7c47faa", "01db403cf99f739f86903314a489fb420e0e254f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 28 12:01:26 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 28 12:01:26 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (47 commits)\n tcp: Fix \u003e4GB writes on 64-bit.\n net/9p: Mount only matching virtio channels\n de2104x: fix ethtool\n tproxy: check for transparent flag in ip_route_newports\n ipv6: add IPv6 to neighbour table overflow warning\n tcp: fix TSO FACK loss marking in tcp_mark_head_lost\n 3c59x: fix regression from patch \"Add ethtool WOL support\"\n ipv6: add a missing unregister_pernet_subsys call\n s390: use free_netdev(netdev) instead of kfree()\n sgiseeq: use free_netdev(netdev) instead of kfree()\n rionet: use free_netdev(netdev) instead of kfree()\n ibm_newemac: use free_netdev(netdev) instead of kfree()\n smsc911x: Add MODULE_ALIAS()\n net: reset skb queue mapping when rx\u0027ing over tunnel\n br2684: fix scheduling while atomic\n de2104x: fix TP link detection\n de2104x: fix power management\n de2104x: disable autonegotiation on broken hardware\n net: fix a lockdep splat\n e1000e: 82579 do not gate auto config of PHY by hardware during nominal use\n ...\n" }, { "commit": "f064af1e500a2bf4607706f0f458163bdb2a6ea5", "tree": "ebbbd1c3c00030c70cab6fe587a5c03252a46ebc", "parents": [ "605c82bab5abe0816e5e32716875c245f89f39da" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Sep 22 12:43:39 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 24 22:26:10 2010 -0700" }, "message": "net: fix a lockdep splat\n\nWe have for each socket :\n\nOne spinlock (sk_slock.slock)\nOne rwlock (sk_callback_lock)\n\nPossible scenarios are :\n\n(A) (this is used in net/sunrpc/xprtsock.c)\nread_lock(\u0026sk-\u003esk_callback_lock) (without blocking BH)\n\u003cBH\u003e\nspin_lock(\u0026sk-\u003esk_slock.slock);\n...\nread_lock(\u0026sk-\u003esk_callback_lock);\n...\n\n(B)\nwrite_lock_bh(\u0026sk-\u003esk_callback_lock)\nstuff\nwrite_unlock_bh(\u0026sk-\u003esk_callback_lock)\n\n(C)\nspin_lock_bh(\u0026sk-\u003esk_slock)\n...\nwrite_lock_bh(\u0026sk-\u003esk_callback_lock)\nstuff\nwrite_unlock_bh(\u0026sk-\u003esk_callback_lock)\nspin_unlock_bh(\u0026sk-\u003esk_slock)\n\nThis (C) case conflicts with (A) :\n\nCPU1 [A] CPU2 [C]\nread_lock(callback_lock)\n\u003cBH\u003e spin_lock_bh(slock)\n\u003cwait to spin_lock(slock)\u003e\n \u003cwait to write_lock_bh(callback_lock)\u003e\n\nWe have one problematic (C) use case in inet_csk_listen_stop() :\n\nlocal_bh_disable();\nbh_lock_sock(child); // spin_lock_bh(\u0026sk-\u003esk_slock)\nWARN_ON(sock_owned_by_user(child));\n...\nsock_orphan(child); // write_lock_bh(\u0026sk-\u003esk_callback_lock)\n\nlockdep is not happy with this, as reported by Tetsuo Handa\n\nIt seems only way to deal with this is to use read_lock_bh(callbacklock)\neverywhere.\n\nThanks to Jarek for pointing a bug in my first attempt and suggesting\nthis solution.\n\nReported-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nTested-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nTested-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "db5fe26541b6b48460104a0d949a27cdc7786957", "tree": "b14418c090e078e1a5eba29d6da710d9cc7de94f", "parents": [ "651b2933b22a0c060e6bb940c4104eb447a61f9a" ], "author": { "name": "Miquel van Smoorenburg", "email": "mikevs@xs4all.net", "time": "Sun Sep 12 19:55:26 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sun Sep 12 19:55:26 2010 -0400" }, "message": "sunrpc: increase MAX_HASHTABLE_BITS to 14\n\nThe maximum size of the authcache is now set to 1024 (10 bits),\nbut on our server we need at least 4096 (12 bits). Increase\nMAX_HASHTABLE_BITS to 14. This is a maximum of 16384 entries,\neach containing a pointer (8 bytes on x86_64). This is\nexactly the limit of kmalloc() (128K).\n\nSigned-off-by: Miquel van Smoorenburg \u003cmikevs@xs4all.net\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "651b2933b22a0c060e6bb940c4104eb447a61f9a", "tree": "8ca4e46718ec63fea52b99c2e9dc32a85029c8dd", "parents": [ "ce8477e1176389ed920550f4c925ad4a815b22d5" ], "author": { "name": "Bian Naimeng", "email": "biannm@cn.fujitsu.com", "time": "Sun Sep 12 19:55:26 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sun Sep 12 19:55:26 2010 -0400" }, "message": "gss:spkm3 miss returning error to caller when import security context\n\nspkm3 miss returning error to up layer when import security context,\nit may be return ok though it has failed to import security context.\n\nSigned-off-by: Bian Naimeng \u003cbiannm@cn.fujitsu.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "ce8477e1176389ed920550f4c925ad4a815b22d5", "tree": "ae8867cc24b245694ac1d27ab2591c31a530fb34", "parents": [ "b1bde04c6d9a120dec602cc8a70b8a7f21600883" ], "author": { "name": "Bian Naimeng", "email": "biannm@cn.fujitsu.com", "time": "Sun Sep 12 19:55:25 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sun Sep 12 19:55:25 2010 -0400" }, "message": "gss:krb5 miss returning error to caller when import security context\n\nkrb5 miss returning error to up layer when import security context,\nit may be return ok though it has failed to import security context.\n\nSigned-off-by: Bian Naimeng \u003cbiannm@cn.fujitsu.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "55576244eba805307a2b2b6a145b8f85f8c7c124", "tree": "b81f059cd196cdc7b8e0c74bba1584e0c7dfcd5e", "parents": [ "006abe887c5e637d059c44310de6c92f36aded3b" ], "author": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Sun Sep 12 19:55:25 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sun Sep 12 19:55:25 2010 -0400" }, "message": "SUNRPC: cleanup state-machine ordering\n\nThis is just a minor cleanup: net/sunrpc/clnt.c clarifies the rpc client\nstate machine by commenting each state and by laying out the functions\nimplementing each state in the order that each state is normally\nexecuted (in the absence of errors).\n\nThe previous patch \"Fix null dereference in call_allocate\" changed the\norder of the states. Move the functions and update the comments to\nreflect the change.\n\nSigned-off-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "006abe887c5e637d059c44310de6c92f36aded3b", "tree": "542ab0f1d56b4d9681c8d61fbf77c9a46062e661", "parents": [ "5a67657a2e90c9e4a48518f95d4ba7777aa20fbb" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sun Sep 12 19:55:25 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sun Sep 12 19:55:25 2010 -0400" }, "message": "SUNRPC: Fix a race in rpc_info_open\n\nThere is a race between rpc_info_open and rpc_release_client()\nin that nothing stops a process from opening the file after\nthe clnt-\u003ecl_kref goes to zero.\n\nFix this by using atomic_inc_unless_zero()...\n\nReported-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "5a67657a2e90c9e4a48518f95d4ba7777aa20fbb", "tree": "bd98ad7f5261afc7ae9ba804937d9ce2fb9e8764", "parents": [ "f2d47d02fd84343a3c5452daca6ed12c75618aff" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sun Sep 12 19:55:25 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sun Sep 12 19:55:25 2010 -0400" }, "message": "SUNRPC: Fix race corrupting rpc upcall\n\nIf rpc_queue_upcall() adds a new upcall to the rpci-\u003epipe list just\nafter rpc_pipe_release calls rpc_purge_list(), but before it calls\ngss_pipe_release (as rpci-\u003eops-\u003erelease_pipe(inode)), then the latter\nwill free a message without deleting it from the rpci-\u003epipe list.\n\nWe will be left with a freed object on the rpc-\u003epipe list. Most\nfrequent symptoms are kernel crashes in rpc.gssd system calls on the\npipe in question.\n\nReported-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "f2d47d02fd84343a3c5452daca6ed12c75618aff", "tree": "7f7e70c78070021d28e319bc1124cea283ec1e84", "parents": [ "49553c2ef88749dd502687f4eb9c258bb10a4f44" ], "author": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Sun Sep 12 19:55:25 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sun Sep 12 19:55:25 2010 -0400" }, "message": "Fix null dereference in call_allocate\n\nIn call_allocate we need to reach the auth in order to factor au_cslack\ninto the allocation.\n\nAs of a17c2153d2e271b0cbacae9bed83b0eaa41db7e1 \"SUNRPC: Move the bound\ncred to struct rpc_rqst\", call_allocate attempts to do this by\ndereferencing tk_client-\u003ecl_auth, however this is not guaranteed to be\ndefined--cl_auth can be zero in the case of gss context destruction (see\nrpc_free_auth).\n\nReorder the client state machine to bind credentials before allocating,\nso that we can instead reach the auth through the cred.\n\nSigned-off-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "763008c4357b73c8d18396dfd8d79dc58fa3f99d", "tree": "818add523a6b81b560bebac727c57c6a8ea6fd63", "parents": [ "d1126ad907ce197ff45fbc2369fbeaf8ae6f75a8", "0a377cff9428af2da2b293d11e07bc4dbf064ee5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 18 15:45:23 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 18 15:45:23 2010 -0700" }, "message": "Merge branch \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:\n NFS: Fix an Oops in the NFSv4 atomic open code\n NFS: Fix the selection of security flavours in Kconfig\n NFS: fix the return value of nfs_file_fsync()\n rpcrdma: Fix SQ size calculation when memreg is FRMR\n xprtrdma: Do not truncate iova_start values in frmr registrations.\n nfs: Remove redundant NULL check upon kfree()\n nfs: Add \"lookupcache\" to displayed mount options\n NFS: allow close-to-open cache semantics to apply to root of NFS filesystem\n SUNRPC: fix NFS client over TCP hangs due to packet loss (Bug 16494)\n" }, { "commit": "df486a25900f4dba9cdc3886c4ac871951c6aef3", "tree": "4d13ffd2b4de988c4d1d8863cf60196476ce48c0", "parents": [ "0702099bd86c33c2dcdbd3963433a61f3f503901" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Aug 17 17:42:45 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Aug 17 17:42:45 2010 -0400" }, "message": "NFS: Fix the selection of security flavours in Kconfig\n\nRandy Dunlap reports:\n\nERROR: \"svc_gss_principal\" [fs/nfs/nfs.ko] undefined!\n\n\nbecause in fs/nfs/Kconfig, NFS_V4 selects RPCSEC_GSS_KRB5\nand/or in fs/nfsd/Kconfig, NFSD_V4 selects RPCSEC_GSS_KRB5.\n\nRPCSEC_GSS_KRB5 does 5 selects, but none of these is enforced/followed\nby the fs/nfs[d]/Kconfig configs:\n\n\tselect SUNRPC_GSS\n\tselect CRYPTO\n\tselect CRYPTO_MD5\n\tselect CRYPTO_DES\n\tselect CRYPTO_CBC\n\nReported-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nCc: J. Bruce Fields \u003cbfields@fieldses.org\u003e\nAcked-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "15cdc644b268a9a9ce73ce0b153129222c254b7b", "tree": "aca119f733a5c0823ed4b294c3eef4a222d55b7c", "parents": [ "7a8b80eb38b248cfdf84048dad12073d5cfba3e6" ], "author": { "name": "Tom Tucker", "email": "tom@ogc.us", "time": "Wed Aug 11 12:47:24 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Aug 11 12:47:24 2010 -0400" }, "message": "rpcrdma: Fix SQ size calculation when memreg is FRMR\n\nThis patch updates the computation to include the worst case situation\nwhere three FRMR are required to map a single RPC REQ.\n\nSigned-off-by: Tom Tucker \u003ctom@ogc.us\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "7a8b80eb38b248cfdf84048dad12073d5cfba3e6", "tree": "d66e1ec8f4b95a1d17dad42af67dd1137a6ece77", "parents": [ "5d7ca35a182a626f8ed5596023ad42eb219a332e" ], "author": { "name": "Steve Wise", "email": "swise@opengridcomputing.com", "time": "Wed Aug 11 12:47:08 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Aug 11 12:47:08 2010 -0400" }, "message": "xprtrdma: Do not truncate iova_start values in frmr registrations.\n\nA bad cast causes the iova_start, which in this case is a 64b DMA\nbus address, to be truncated on 32b systems. This breaks frmrs on\n32b systems. No cast is needed.\n\nSigned-off-by: Steve Wise \u003cswise@opengridcomputing.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "8e4e15d44a817e9f02cb04a6cd6c0ee77ed3fbd8", "tree": "292477c3dff33e574daf73fa8d1c858123dea21e", "parents": [ "101d6c826fa03266f8538ea4f6a459190e6863e8" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Wed Aug 04 12:11:22 2010 +1000" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Aug 11 23:04:15 2010 +0930" }, "message": "nfs: update for module_param_named API change\n\nAfter merging the rr tree, today\u0027s linux-next build (powerpc\nppc64_defconfig) failed like this:\n\nnet/sunrpc/auth.c:74: error: \u0027param_ops_hashtbl_sz\u0027 undeclared here (not in a function)\n\nCaused by commit 0685652df0929cec7d78efa85127f6eb34962132\n(\"param:param_ops\") interacting with commit\nf8f853ab19fcc415b6eadd273373edc424916212 (\"SUNRPC: Make the credential\ncache hashtable size configurable\") from the nfs tree.\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "9bbb9e5a33109b2832e2e63dcc7a132924ab374b", "tree": "87270ed3a61d0d0e654a61c8d44504cdef330192", "parents": [ "a14fe249a8f74269c9e636bcbaa78f5bdb354ce3" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Aug 11 23:04:12 2010 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Aug 11 23:04:13 2010 +0930" }, "message": "param: use ops in struct kernel_param, rather than get and set fns directly\n\nThis is more kernel-ish, saves some space, and also allows us to\nexpand the ops without breaking all the callers who are happy for the\nnew members to be NULL.\n\nThe few places which defined their own param types are changed to the\nnew scheme (more which crept in recently fixed in following patches).\n\nSince we\u0027re touching them anyway, we change get() and set() to take a\nconst struct kernel_param (which they really are). This causes some\nharmless warnings until we fix them (in following patches).\n\nTo reduce churn, module_param_call creates the ops struct so the callers\ndon\u0027t have to change (and casts the functions to reduce warnings).\nThe modern version which takes an ops struct is called module_param_cb.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nReviewed-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nTested-by: Phil Carmody \u003cext-phil.2.carmody@nokia.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Ville Syrjala \u003csyrjala@sci.fi\u003e\nCc: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\nCc: Alessandro Rubini \u003crubini@ipvvis.unipv.it\u003e\nCc: Michal Januszewski \u003cspock@gentoo.org\u003e\nCc: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: \"J. Bruce Fields\" \u003cbfields@fieldses.org\u003e\nCc: Neil Brown \u003cneilb@suse.de\u003e\nCc: linux-kernel@vger.kernel.org\nCc: linux-input@vger.kernel.org\nCc: linux-fbdev-devel@lists.sourceforge.net\nCc: linux-nfs@vger.kernel.org\nCc: netdev@vger.kernel.org\n" }, { "commit": "669502ff31d7dba1849aec7ee2450a3c61f57d39", "tree": "a56e4958f71efcc5e9f844255e3d437e00306a06", "parents": [ "f6cec0ae58c17522a7bc4e2f39dae19f199ab534" ], "author": { "name": "Andy Chittenden", "email": "andyc.bluearc@gmail.com", "time": "Tue Aug 10 10:19:53 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Aug 10 10:19:53 2010 -0400" }, "message": "SUNRPC: fix NFS client over TCP hangs due to packet loss (Bug 16494)\n\nWhen reusing a TCP connection, ensure that it\u0027s aborted if a previous\nshutdown attempt has been made on that connection so that the RPC over\nTCP recovery mechanism succeeds.\n\nSigned-off-by: Andy Chittenden \u003candyc.bluearc@gmail.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "0d9f9e122c74583de15a86d1c660c08dc298f2c8", "tree": "a04ad387e231db43db112753fa2eae23754189a9", "parents": [ "df44f9f4f9b5d362b5a2d1c8444fe7e6d4c42653", "998db52c03cd293d16a457f1b396cea932244147" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 14:24:41 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 14:24:41 2010 -0700" }, "message": "Merge branch \u0027for-2.6.36\u0027 of git://linux-nfs.org/~bfields/linux\n\n* \u0027for-2.6.36\u0027 of git://linux-nfs.org/~bfields/linux: (34 commits)\n nfsd4: fix file open accounting for RDWR opens\n nfsd: don\u0027t allow setting maxblksize after svc created\n nfsd: initialize nfsd versions before creating svc\n net: sunrpc: removed duplicated #include\n nfsd41: Fix a crash when a callback is retried\n nfsd: fix startup/shutdown order bug\n nfsd: minor nfsd read api cleanup\n gcc-4.6: nfsd: fix initialized but not read warnings\n nfsd4: share file descriptors between stateid\u0027s\n nfsd4: fix openmode checking on IO using lock stateid\n nfsd4: miscellaneous process_open2 cleanup\n nfsd4: don\u0027t pretend to support write delegations\n nfsd: bypass readahead cache when have struct file\n nfsd: minor nfsd_svc() cleanup\n nfsd: move more into nfsd_startup()\n nfsd: just keep single lockd reference for nfsd\n nfsd: clean up nfsd_create_serv error handling\n nfsd: fix error handling in __write_ports_addxprt\n nfsd: fix error handling when starting nfsd with rpcbind down\n nfsd4: fix v4 state shutdown error paths\n ...\n" }, { "commit": "5df6b8e65ad0f2eaee202ff002ac00d1ac605315", "tree": "2eff6606f8e39dc1fd7eb8a05feb2a9927151805", "parents": [ "fe21ea18c742ab0eb8f6f8ebc543374839a02a87", "3dce9a5c3a39a664e372886ea86c42ae7ae33dfc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 13:19:36 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 13:19:36 2010 -0700" }, "message": "Merge branch \u0027nfs-for-2.6.36\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027nfs-for-2.6.36\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (42 commits)\n NFS: NFSv4.1 is no longer a \"developer only\" feature\n NFS: NFS_V4 is no longer an EXPERIMENTAL feature\n NFS: Fix /proc/mount for legacy binary interface\n NFS: Fix the locking in nfs4_callback_getattr\n SUNRPC: Defer deleting the security context until gss_do_free_ctx()\n SUNRPC: prevent task_cleanup running on freed xprt\n SUNRPC: Reduce asynchronous RPC task stack usage\n SUNRPC: Move the bound cred to struct rpc_rqst\n SUNRPC: Clean up of rpc_bindcred()\n SUNRPC: Move remaining RPC client related task initialisation into clnt.c\n SUNRPC: Ensure that rpc_exit() always wakes up a sleeping task\n SUNRPC: Make the credential cache hashtable size configurable\n SUNRPC: Store the hashtable size in struct rpc_cred_cache\n NFS: Ensure the AUTH_UNIX credcache is allocated dynamically\n NFS: Fix the NFS users of rpc_restart_call()\n SUNRPC: The function rpc_restart_call() should return success/failure\n NFSv4: Get rid of the bogus RPC_ASSASSINATED(task) checks\n NFSv4: Clean up the process of renewing the NFSv4 lease\n NFSv4.1: Handle NFS4ERR_DELAY on SEQUENCE correctly\n NFS: nfs_rename() should not have to flush out writebacks\n ...\n" }, { "commit": "e2aa7f8304b3b5656ded8699216cc65138d03b64", "tree": "a7bcb0f3d96a5d2b5d6d3fa36f9cf5b1aa9d7343", "parents": [ "c18c821fd40ad0ffc199a55be874e556bf999416" ], "author": { "name": "Andrea Gelmini", "email": "andrea.gelmini@gelma.net", "time": "Thu Aug 05 15:51:36 2010 +0200" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Fri Aug 06 17:05:39 2010 -0400" }, "message": "net: sunrpc: removed duplicated #include\n\nSigned-off-by: Andrea Gelmini \u003candrea.gelmini@gelma.net\u003e\nSigned-off-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\n" }, { "commit": "0d8a374673c9bc62bc78a2d8fe64553a51542cb4", "tree": "b3e5807bc7dd434465327726fdb2f94829cefc86", "parents": [ "c3ae62ae08bb0db3639d8c579e4ff0967d908199" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sun Aug 01 20:14:55 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Aug 04 08:55:14 2010 -0400" }, "message": "SUNRPC: Defer deleting the security context until gss_do_free_ctx()\n\nThere is no need to delete the gss context separately from the rest\nof the security context information, and doing so gives rise to a\nan rcu_dereference_check() warning.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "c3ae62ae08bb0db3639d8c579e4ff0967d908199", "tree": "75228755a6cdd508a62597be61a04408f949975d", "parents": [ "d6a1ed08c6acea647b3f2aaebe0261f079e1be49" ], "author": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Tue Aug 03 17:22:20 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Aug 04 08:54:10 2010 -0400" }, "message": "SUNRPC: prevent task_cleanup running on freed xprt\n\nWe saw a report of a NULL dereference in xprt_autoclose:\n\n\thttps://bugzilla.redhat.com/show_bug.cgi?id\u003d611938\n\nThis appears to be the result of an xprt\u0027s task_cleanup running after\nthe xprt is destroyed. Nothing in the current code appears to prevent\nthat.\n\nSigned-off-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "d6a1ed08c6acea647b3f2aaebe0261f079e1be49", "tree": "fedcaec8eefe38f0280a48cbb15d60542656e139", "parents": [ "a17c2153d2e271b0cbacae9bed83b0eaa41db7e1" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sat Jul 31 14:29:08 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Aug 04 08:54:09 2010 -0400" }, "message": "SUNRPC: Reduce asynchronous RPC task stack usage\n\nWe should just farm out asynchronous RPC tasks immediately to rpciod...\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "a17c2153d2e271b0cbacae9bed83b0eaa41db7e1", "tree": "3c5a73090987278e51aee1a9f185ebe40a00bd65", "parents": [ "8572b8e2e3c5f3d990122348c4d2c64dad338611" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sat Jul 31 14:29:08 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Aug 04 08:54:09 2010 -0400" }, "message": "SUNRPC: Move the bound cred to struct rpc_rqst\n\nThis will allow us to save the original generic cred in rpc_message, so\nthat if we migrate from one server to another, we can generate a new bound\ncred without having to punt back to the NFS layer.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "8572b8e2e3c5f3d990122348c4d2c64dad338611", "tree": "5de87a7f2cb1c1105313c0fb1d1f26a969961c83", "parents": [ "58f9612c6ea858f532021a0ce42ec53cb0a493b3" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sat Jul 31 14:29:08 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Aug 04 08:54:08 2010 -0400" }, "message": "SUNRPC: Clean up of rpc_bindcred()\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "58f9612c6ea858f532021a0ce42ec53cb0a493b3", "tree": "9466a16cd79c547fddcec5bd598d8097ae9a3859", "parents": [ "d9b6cd94601e1d17273f93a326a135fbf487a918" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sat Jul 31 14:29:08 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Aug 04 08:54:07 2010 -0400" }, "message": "SUNRPC: Move remaining RPC client related task initialisation into clnt.c\n\nNow that rpc_run_task() is the sole entry point for RPC calls, we can move\nthe remaining rpc_client-related initialisation of struct rpc_task from\nsched.c into clnt.c.\n\nAlso move rpc_killall_tasks() into the same file, since that too is\nrelative to the rpc_clnt.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "d9b6cd94601e1d17273f93a326a135fbf487a918", "tree": "5c616c0717551d02d16da685fbbd93344859fa28", "parents": [ "241269bd0b580faae71575443d9ab38df7469126" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sat Jul 31 14:29:08 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Aug 04 08:54:07 2010 -0400" }, "message": "SUNRPC: Ensure that rpc_exit() always wakes up a sleeping task\n\nMake rpc_exit() non-inline, and ensure that it always wakes up a task that\nhas been queued.\n\nKill off the now unused rpc_wake_up_task().\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "241269bd0b580faae71575443d9ab38df7469126", "tree": "b438cf34fd67b2b96b0a28be3241fd8d0c43fbca", "parents": [ "988664a0f6bbfc356e6ce55f7a87b8594050012f" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sat Jul 31 14:29:08 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Aug 04 08:54:06 2010 -0400" }, "message": "SUNRPC: Make the credential cache hashtable size configurable\n\nThis patch allows the user to configure the credential cache hashtable size\nusing a new module parameter: auth_hashtable_size\nWhen set, this parameter will be rounded up to the nearest power of two,\nwith a maximum allowed value of 1024 elements.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "988664a0f6bbfc356e6ce55f7a87b8594050012f", "tree": "c6c6450c8559c13ca9d53c8959ffa4276f3eddf1", "parents": [ "5d8d9a4d9ff74c55901642b4e2ac5124830ddafe" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sat Jul 31 14:29:07 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Aug 04 08:54:05 2010 -0400" }, "message": "SUNRPC: Store the hashtable size in struct rpc_cred_cache\n\nCleanup in preparation for allowing the user to determine the maximum hash\ntable size.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "5d8d9a4d9ff74c55901642b4e2ac5124830ddafe", "tree": "9f171aa61048cf5c154597466af21ea7c4d701a2", "parents": [ "d05dd4e98f0dd30ee933e05ac9363614c47df83a" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sat Jul 31 14:29:07 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Aug 04 08:52:57 2010 -0400" }, "message": "NFS: Ensure the AUTH_UNIX credcache is allocated dynamically\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "f1f88fc7e818c6678c6799a2edb8f1aeccc124aa", "tree": "a5aec7e7e522500df78b5cbf1f2ce430462552e2", "parents": [ "a6f03393ec86fd25523c79497a9a773bda170d1d" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sat Jul 31 14:29:07 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Aug 03 22:06:44 2010 -0400" }, "message": "SUNRPC: The function rpc_restart_call() should return success/failure\n\nBoth rpc_restart_call_prepare() and rpc_restart_call() test for the\nRPC_TASK_KILLED flag, and fail to restart the RPC call if that flag is set.\n\nThis patch allows callers to know whether or not the restart was\nsuccessful, so that they can perform cleanups etc in case of failure.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "567c7b0edec0200c5c6613f07c3d3b4034fdc836", "tree": "ee9724f1b9b8bed762a57877c4940074a37ce6a4", "parents": [ "f4b23cc2d5dc78ef5acbc529eb1219cc41eb5b96" ], "author": { "name": "Dave Chinner", "email": "dchinner@redhat.com", "time": "Wed Jul 21 15:33:01 2010 +1000" }, "committer": { "name": "Dave Chinner", "email": "david@fromorbit.com", "time": "Wed Jul 21 15:33:01 2010 +1000" }, "message": "mm: add context argument to shrinker callback to remaining shrinkers\n\nAdd the shrinkers missed in the first conversion of the API in\ncommit 7f8275d0d660c146de6ee3017e1e2e594c49e820 (\"mm: add context argument to\nshrinker callback\").\n\nSigned-off-by: Dave Chinner \u003cdchinner@redhat.com\u003e\n" }, { "commit": "8eab945c5616fc984e97b922d6a2559be93f39a1", "tree": "13ad5889aae1f8f3541a5a49e9decf42240e445c", "parents": [ "cba9ba4b902270c22f8b9c5149a284216b633fc1" ], "author": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@nokia.com", "time": "Thu Jul 01 18:05:56 2010 +0300" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@citi.umich.edu", "time": "Tue Jul 06 12:27:48 2010 -0400" }, "message": "sunrpc: make the cache cleaner workqueue deferrable\n\nThis patch makes the cache_cleaner workqueue deferrable, to prevent\nunnecessary system wake-ups, which is very important for embedded\nbattery-powered devices.\n\ndo_cache_clean() is called every 30 seconds at the moment, and often\nmakes the system wake up from its power-save sleep state. With this\nchange, when the workqueue uses a deferrable timer, the\ndo_cache_clean() invocation will be delayed and combined with the\nclosest \"real\" wake-up. This improves the power consumption situation.\n\nNote, I tried to create a DECLARE_DELAYED_WORK_DEFERRABLE() helper\nmacro, similar to DECLARE_DELAYED_WORK(), but failed because of the\nway the timer wheel core stores the deferrable flag (it is the\nLSBit in the time-\u003ebase pointer). My attempt to define a static\nvariable with this bit set ended up with the \"initializer element is\nnot constant\" error.\n\nThus, I have to use run-time initialization, so I created a new\ncache_initialize() function which is called once when sunrpc is\nbeing initialized.\n\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: J. Bruce Fields \u003cbfields@citi.umich.edu\u003e\n" }, { "commit": "b76ce56192bcf618013fb9aecd83488cffd645cc", "tree": "1a071da8b3e4fcc1fbfe67c99cc622372502edb2", "parents": [ "f799bdb355edaabd81b778087613409a8932fbe9" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Jun 16 13:57:32 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Jun 22 13:21:18 2010 -0400" }, "message": "SUNRPC: Fix a re-entrancy bug in xs_tcp_read_calldir()\n\nIf the attempt to read the calldir fails, then instead of storing the read\nbytes, we currently discard them. This leads to a garbage final result when\nupon re-entry to the same routine, we read the remaining bytes.\n\nFixes the regression in bugzilla number 16213. Please see\n https://bugzilla.kernel.org/show_bug.cgi?id\u003d16213\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "0a68b0bed08eeb7ec62e0125f17856b1ccb1ea4b", "tree": "2f131868f81599273693d0481a4166277c4f1077", "parents": [ "b1cdc4670b9508fcd47a15fbd12f70d269880b37" ], "author": { "name": "J. Bruce Fields", "email": "bfields@citi.umich.edu", "time": "Wed May 26 08:42:24 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed May 26 08:43:50 2010 -0400" }, "message": "sunrpc: fix leak on error on socket xprt setup\n\nAlso collect exit code together while we\u0027re at it.\n\nSigned-off-by: J. Bruce Fields \u003cbfields@citi.umich.edu\u003e\nCc: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "ef7ffe8f06895312aeb08a5f8a1d4c90e34335ea", "tree": "c7d6bc1c559c67b53f6ea7fce5a6bf537a71ca8b", "parents": [ "08a82c6872ac1d37cb993a52f1b35f97f48295bd" ], "author": { "name": "Alex Riesen", "email": "raa.lkml@gmail.com", "time": "Mon May 24 14:33:05 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:03 2010 -0700" }, "message": "sunrpc: use formatting of module name in SUNRPC\n\ngcc-4.3.3 produces the warning:\n \"format not a string literal and no format arguments\"\n\nSigned-off-by: Alex Riesen \u003craa.lkml@gmail.com\u003e\nCc: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: Chuck Lever \u003ccel@citi.umich.edu\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Tom Talpey \u003ctmtalpey@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4be929be34f9bdeffa40d815d32d7d60d2c7f03b", "tree": "4d2c6e2b8ef766e565e2e050ee151de2e02081d3", "parents": [ "940370fc86b920b51a34217a1facc3e9e97c2456" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Mon May 24 14:33:03 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:02 2010 -0700" }, "message": "kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT_MAX and SHRT_MIN\n\n- C99 knows about USHRT_MAX/SHRT_MAX/SHRT_MIN, not\n USHORT_MAX/SHORT_MAX/SHORT_MIN.\n\n- Make SHRT_MIN of type s16, not int, for consistency.\n\n[akpm@linux-foundation.org: fix drivers/dma/timb_dma.c]\n[akpm@linux-foundation.org: fix security/keys/keyring.c]\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nAcked-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f13771187b9423b824f32518319f6da85d819003", "tree": "c431cf16c286065a302d5f3fb43fc1abac7e4047", "parents": [ "15953654cc312429740fd58fb37a5a3d63a54376", "9f37af654fda88a8dcca74c785f6c20e52758866" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 08:01:10 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 08:01:10 2010 -0700" }, "message": "Merge branch \u0027bkl/ioctl\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing\n\n* \u0027bkl/ioctl\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:\n uml: Pushdown the bkl from harddog_kern ioctl\n sunrpc: Pushdown the bkl from sunrpc cache ioctl\n sunrpc: Pushdown the bkl from ioctl\n autofs4: Pushdown the bkl from ioctl\n uml: Convert to unlocked_ioctls to remove implicit BKL\n ncpfs: BKL ioctl pushdown\n coda: Clean-up whitespace problems in pioctl.c\n coda: BKL ioctl pushdown\n drivers: Push down BKL into various drivers\n isdn: Push down BKL into ioctl functions\n scsi: Push down BKL into ioctl functions\n dvb: Push down BKL into ioctl functions\n smbfs: Push down BKL into ioctl function\n coda/psdev: Remove BKL from ioctl function\n um/mmapper: Remove BKL usage\n sn_hwperf: Kill BKL usage\n hfsplus: Push down BKL into ioctl function\n" }, { "commit": "9918ff26b301e9a57f25fb12b44a46ad0c1e8f8f", "tree": "1b9795fc5d6e7f085b48d8a3cd853a5668f772d5", "parents": [ "674b604cdd389252d89a14133b6ebf80165d1d55" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Wed May 19 15:08:17 2010 +0200" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Sat May 22 17:44:20 2010 +0200" }, "message": "sunrpc: Pushdown the bkl from sunrpc cache ioctl\n\nPushdown the bkl to cache_ioctl_pipefs.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: \"J. Bruce Fields\" \u003cbfields@fieldses.org\u003e\nCc: Neil Brown \u003cneilb@suse.de\u003e\nCc: Nfs \u003clinux-nfs@vger.kernel.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: John Kacur \u003cjkacur@redhat.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "674b604cdd389252d89a14133b6ebf80165d1d55", "tree": "249bc1db46d63b6104474c937ad5a15b70cbfe02", "parents": [ "3663df70c028bc435d6f2ec532a4849db62d1656" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Wed May 19 15:08:17 2010 +0200" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Sat May 22 17:44:19 2010 +0200" }, "message": "sunrpc: Pushdown the bkl from ioctl\n\nPushdown the bkl to rpc_pipe_ioctl.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: \"J. Bruce Fields\" \u003cbfields@fieldses.org\u003e\nCc: Neil Brown \u003cneilb@suse.de\u003e\nCc: Nfs \u003clinux-nfs@vger.kernel.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: John Kacur \u003cjkacur@redhat.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "f8965467f366fd18f01feafb5db10512d7b4422c", "tree": "3706a9cd779859271ca61b85c63a1bc3f82d626e", "parents": [ "a26272e5200765691e67d6780e52b32498fdb659", "2ec8c6bb5d8f3a62a79f463525054bae1e3d4487" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 21:04:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 21:04:44 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)\n qlcnic: adding co maintainer\n ixgbe: add support for active DA cables\n ixgbe: dcb, do not tag tc_prio_control frames\n ixgbe: fix ixgbe_tx_is_paused logic\n ixgbe: always enable vlan strip/insert when DCB is enabled\n ixgbe: remove some redundant code in setting FCoE FIP filter\n ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp\n ixgbe: fix header len when unsplit packet overflows to data buffer\n ipv6: Never schedule DAD timer on dead address\n ipv6: Use POSTDAD state\n ipv6: Use state_lock to protect ifa state\n ipv6: Replace inet6_ifaddr-\u003edead with state\n cxgb4: notify upper drivers if the device is already up when they load\n cxgb4: keep interrupts available when the ports are brought down\n cxgb4: fix initial addition of MAC address\n cnic: Return SPQ credit to bnx2x after ring setup and shutdown.\n cnic: Convert cnic_local_flags to atomic ops.\n can: Fix SJA1000 command register writes on SMP systems\n bridge: fix build for CONFIG_SYSFS disabled\n ARCNET: Limit com20020 PCI ID matches for SOHARD cards\n ...\n\nFix up various conflicts with pcmcia tree drivers/net/\n{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and\nwireless/orinoco/spectrum_cs.c} and feature removal\n(Documentation/feature-removal-schedule.txt).\n\nAlso fix a non-content conflict due to pm_qos_requirement getting\nrenamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c\n" }, { "commit": "f72caf7e496465182eeda842ac66a5e75404ddf1", "tree": "682e2e4b34d6240ea5dbc516d368dd14b21de182", "parents": [ "6a6be470c3071559970c5659354484d4f664050e", "e4e83ea47babd9d4bf95a13aed87f8ef51e46472" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 17:24:54 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 17:24:54 2010 -0700" }, "message": "Merge branch \u0027for-2.6.35\u0027 of git://linux-nfs.org/~bfields/linux\n\n* \u0027for-2.6.35\u0027 of git://linux-nfs.org/~bfields/linux: (45 commits)\n Revert \"nfsd4: distinguish expired from stale stateids\"\n nfsd: safer initialization order in find_file()\n nfs4: minor callback code simplification, comment\n NFSD: don\u0027t report compiled-out versions as present\n nfsd4: implement reclaim_complete\n nfsd4: nfsd4_destroy_session must set callback client under the state lock\n nfsd4: keep a reference count on client while in use\n nfsd4: mark_client_expired\n nfsd4: introduce nfs4_client.cl_refcount\n nfsd4: refactor expire_client\n nfsd4: extend the client_lock to cover cl_lru\n nfsd4: use list_move in move_to_confirmed\n nfsd4: fold release_session into expire_client\n nfsd4: rename sessionid_lock to client_lock\n nfsd4: fix bare destroy_session null dereference\n nfsd4: use local variable in nfs4svc_encode_compoundres\n nfsd: further comment typos\n sunrpc: centralise most calls to svc_xprt_received\n nfsd4: fix unlikely race in session replay case\n nfsd4: fix filehandle comment\n ...\n" }, { "commit": "6a6be470c3071559970c5659354484d4f664050e", "tree": "d4b335e863e426acad96fe5e4bce2e3e064abc32", "parents": [ "98c89cdd3a292af3451e47a2a33132f5183861b0", "126e216a8730532dfb685205309275f87e3d133e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 17:24:05 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 17:24:05 2010 -0700" }, "message": "Merge branch \u0027nfs-for-2.6.35\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027nfs-for-2.6.35\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (78 commits)\n SUNRPC: Don\u0027t spam gssd with upcall requests when the kerberos key expired\n SUNRPC: Reorder the struct rpc_task fields\n SUNRPC: Remove the \u0027tk_magic\u0027 debugging field\n SUNRPC: Move the task-\u003etk_bytes_sent and tk_rtt to struct rpc_rqst\n NFS: Don\u0027t call iput() in nfs_access_cache_shrinker\n NFS: Clean up nfs_access_zap_cache()\n NFS: Don\u0027t run nfs_access_cache_shrinker() when the mask is GFP_NOFS\n SUNRPC: Ensure rpcauth_prune_expired() respects the nr_to_scan parameter\n SUNRPC: Ensure memory shrinker doesn\u0027t waste time in rpcauth_prune_expired()\n SUNRPC: Dont run rpcauth_cache_shrinker() when gfp_mask is GFP_NOFS\n NFS: Read requests can use GFP_KERNEL.\n NFS: Clean up nfs_create_request()\n NFS: Don\u0027t use GFP_KERNEL in rpcsec_gss downcalls\n NFSv4: Don\u0027t use GFP_KERNEL allocations in state recovery\n SUNRPC: Fix xs_setup_bc_tcp()\n SUNRPC: Replace jiffies-based metrics with ktime-based metrics\n ktime: introduce ktime_to_ms()\n SUNRPC: RPC metrics and RTT estimator should use same RTT value\n NFS: Calldata for nfs4_renew_done()\n NFS: Squelch compiler warning in nfs_add_server_stats()\n ...\n" }, { "commit": "98c89cdd3a292af3451e47a2a33132f5183861b0", "tree": "cfad77bcfd2d04fb0b9326a859803a1ab90b0757", "parents": [ "164d44fd92e79d5bce54d0d62df9f856f7b23925", "99df95a22f7cfcf85405d4edc07c2d953542f0dd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 17:23:28 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 17:23:28 2010 -0700" }, "message": "Merge branch \u0027bkl/procfs\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing\n\n* \u0027bkl/procfs\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:\n sunrpc: Include missing smp_lock.h\n procfs: Kill the bkl in ioctl\n procfs: Push down the bkl from ioctl\n procfs: Use generic_file_llseek in /proc/vmcore\n procfs: Use generic_file_llseek in /proc/kmsg\n procfs: Use generic_file_llseek in /proc/kcore\n procfs: Kill BKL in llseek on proc base\n" }, { "commit": "3fa21e07e6acefa31f974d57fba2b6920a7ebd1a", "tree": "4254644ef2579e9ac96db6ec0535b5e4231fd18e", "parents": [ "b60b6592baa69c43a5a0f55d6300a7feaab15338" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon May 17 23:08:21 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 23:23:14 2010 -0700" }, "message": "net: Remove unnecessary returns from void function()s\n\nThis patch removes from net/ (but not any netfilter files)\nall the unnecessary return; statements that precede the\nlast closing brace of void functions.\n\nIt does not remove the returns that are immediately\npreceded by a label as gcc doesn\u0027t like that.\n\nDone via:\n$ grep -rP --include\u003d*.[ch] -l \"return;\\n}\" net/ | \\\n xargs perl -i -e \u0027local $/ ; while (\u003c\u003e) { s/\\n[ \\t\\n]+return;\\n}/\\n}/g; print; }\u0027\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "99df95a22f7cfcf85405d4edc07c2d953542f0dd", "tree": "9bdcd20f1b7191268ded5feb0d1122685e2df44c", "parents": [ "c2f980500a81006173daf3048284b28832858616" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Tue Apr 13 22:46:36 2010 +0200" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Mon May 17 03:06:31 2010 +0200" }, "message": "sunrpc: Include missing smp_lock.h\n\nNow that cache_ioctl_procfs() calls the bkl explicitly, we need to\ninclude the relevant header as well.\n\nThis fixes the following build error:\n\n\tnet/sunrpc/cache.c: In function \u0027cache_ioctl_procfs\u0027:\n\tnet/sunrpc/cache.c:1355: error: implicit declaration of function \u0027lock_kernel\u0027\n\tnet/sunrpc/cache.c:1359: error: implicit declaration of function \u0027unlock_kernel\u0027\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\n" }, { "commit": "d79b6f4de5db0103ceb4734e42ad101d836d61d9", "tree": "42fada62898eb8d70faff151d87c16575dbabd58", "parents": [ "73296bc611cee009f3be6b451e827d1425b9c10f" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Tue Mar 30 07:27:50 2010 +0200" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Mon May 17 03:06:12 2010 +0200" }, "message": "procfs: Push down the bkl from ioctl\n\nPush down the bkl from procfs\u0027s ioctl main handler to its users.\nOnly three procfs users implement an ioctl (non unlocked) handler.\nTurn them into unlocked_ioctl and push down the Devil inside.\n\nv2: PDE(inode)-\u003edata doesn\u0027t need to be under bkl\nv3: And don\u0027t forget to git-add the result\nv4: Use wrappers to pushdown instead of an invasive and error prone\n handlers surgery.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: John Kacur \u003cjkacur@redhat.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Al Viro \u003cviro@ZenIV.linux.org.uk\u003e\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\n" }, { "commit": "126e216a8730532dfb685205309275f87e3d133e", "tree": "6a73e5d6a5af2866e260ccb7909582e2ccd5741f", "parents": [ "9bb0b8136a7d5b50c5807af3bf12b758fb257814" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu May 13 12:55:38 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:37 2010 -0400" }, "message": "SUNRPC: Don\u0027t spam gssd with upcall requests when the kerberos key expired\n\nNow that the rpc.gssd daemon can explicitly tell us that the key expired,\nwe should cache that information to avoid spamming gssd.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "d72b6cec8d42eb7c2a249b613abf2c2b7a6eeb47", "tree": "c577536a08739621dfbde8c1d30eb88ba8414464", "parents": [ "d60dbb20a74c2cfa142be0a34dac3c6547ea086c" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu May 13 12:51:50 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:36 2010 -0400" }, "message": "SUNRPC: Remove the \u0027tk_magic\u0027 debugging field\n\nIt has not triggered in almost a decade. Time to get rid of it...\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "d60dbb20a74c2cfa142be0a34dac3c6547ea086c", "tree": "7af95739f8fbbef11f490b5b58bf639dbbe8a181", "parents": [ "9c7e7e23371e629dbb3b341610a418cdf1c19d91" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu May 13 12:51:49 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:36 2010 -0400" }, "message": "SUNRPC: Move the task-\u003etk_bytes_sent and tk_rtt to struct rpc_rqst\n\nIt seems strange to maintain stats for bytes_sent in one structure, and\nbytes received in another. Try to assemble all the RPC request-related\nstats in struct rpc_rqst\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "20673406534176ead9b984a84b662928110f77b1", "tree": "4d3a48c79f012af1caea39cc2c8c2b1e0c132911", "parents": [ "93a05e65c090dda9cbd79d0cf57b65c4dbd8da55" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu May 13 12:51:06 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:35 2010 -0400" }, "message": "SUNRPC: Ensure rpcauth_prune_expired() respects the nr_to_scan parameter\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "93a05e65c090dda9cbd79d0cf57b65c4dbd8da55", "tree": "bcffc5640b3038292362afb4283965b94f60cc0f", "parents": [ "d300a41ef1c39cc5e6b90fd8834ea7ab16b5c48f" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu May 13 12:51:06 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:34 2010 -0400" }, "message": "SUNRPC: Ensure memory shrinker doesn\u0027t waste time in rpcauth_prune_expired()\n\nThe \u0027cred_unused\u0027 list, that is traversed by rpcauth_cache_shrinker is\nordered by time. If we hit a credential that is under the 60 second garbage\ncollection moratorium, we should exit because we know at that point that\nall successive credentials are subject to the same moratorium...\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "d300a41ef1c39cc5e6b90fd8834ea7ab16b5c48f", "tree": "2d439ac7e0a95329daf686ea27ba0cea35acb301", "parents": [ "93870d76fee22e887aa6e7e1fc904dbeca976928" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu May 13 12:51:03 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:34 2010 -0400" }, "message": "SUNRPC: Dont run rpcauth_cache_shrinker() when gfp_mask is GFP_NOFS\n\nUnder some circumstances, put_rpccred() can end up allocating memory, so\ncheck the gfp_mask to prevent deadlocks.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "1f4c86c0be9064ab4eebd9e67c84606c1cfeec4b", "tree": "6ae9e8e6550f644335bbf6812edd7e6cfcde7e53", "parents": [ "8535b2be5181fc3019e4150567ef53210fe3b04f" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu May 13 12:51:02 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:33 2010 -0400" }, "message": "NFS: Don\u0027t use GFP_KERNEL in rpcsec_gss downcalls\n\nAgain, we can deadlock if the memory reclaim triggers a writeback that\nrequires a rpcsec_gss credential lookup.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "712a4338669d7d57f952244abb608e6ac07e39da", "tree": "97875575e55a85ac02acc39bb7fe6a6139c71885", "parents": [ "ff8399709e41bf72b4cb145612a0f9a9f7283c83" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed May 12 17:50:23 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:33 2010 -0400" }, "message": "SUNRPC: Fix xs_setup_bc_tcp()\n\nIt is a BUG for anybody to call this function without setting\nargs-\u003ebc_xprt. Trying to return an error value is just wrong, since the\nuser cannot fix this: it is a programming error, not a user error.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "ff8399709e41bf72b4cb145612a0f9a9f7283c83", "tree": "5577163d56e30020d907245f00dcef17730f037b", "parents": [ "f56916b97fe2031761ca611f0a342efd913afb33" ], "author": { "name": "Chuck Lever", "email": "chuck.lever@oracle.com", "time": "Fri May 07 13:34:47 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:33 2010 -0400" }, "message": "SUNRPC: Replace jiffies-based metrics with ktime-based metrics\n\nCurrently RPC performance metrics that tabulate elapsed time use\njiffies time values. This is problematic on systems that use slow\njiffies (for instance 100HZ systems built for paravirtualized\nenvironments). It is also a problem for computing precise latency\nstatistics for advanced network transports, such as InfiniBand,\nthat can have round-trip latencies significanly faster than a single\nclock tick.\n\nFor the RPC client, adopt the high resolution time stamp mechanism\nalready used by the network layer and blktrace: ktime.\n\nWe use ktime format time stamps for all internal computations, and\nconvert to milliseconds for presentation. As a result, we need only\naddition operations in the performance critical paths; multiply/divide\nis required only for presentation.\n\nWe could report RTT metrics in microseconds. In fact the mountstats\nformat is versioned to accomodate exactly this kind of interface\nimprovement.\n\nFor now, however, we\u0027ll stay with millisecond precision for\npresentation to maintain backwards compatibility with the handful of\ncurrently deployed user space tools. At a later point, we\u0027ll move to\nan API such as BDI_STATS where a finer timestamp precision can be\nreported.\n\nSigned-off-by: Chuck Lever \u003cchuck.lever@oracle.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "bbc72cea58f671665b6362be0d4e391813ac0eee", "tree": "e70a35d3bc05ece4a532514893fec151aee2bd46", "parents": [ "9bc4e3ca46e4eb9cb434de4175c6041d00bbdca3" ], "author": { "name": "Chuck Lever", "email": "chuck.lever@oracle.com", "time": "Fri May 07 13:34:27 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:32 2010 -0400" }, "message": "SUNRPC: RPC metrics and RTT estimator should use same RTT value\n\nCompute an RPC request\u0027s RTT once, and use that value both for reporting\nRPC metrics, and for adjusting the RTT context used by the RPC client\u0027s RTT\nestimator algorithm.\n\nSigned-off-by: Chuck Lever \u003cchuck.lever@oracle.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "a8ce4a8f37fef0a09a1e920c2e09f67a80426c7e", "tree": "cd3c11c87fa63c8bf15e74f311560a83637fc3fa", "parents": [ "0b9e79431377df452348e78262dd5a3dc359eeef" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 16 16:42:12 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:30 2010 -0400" }, "message": "SUNRPC: Fail over more quickly on connect errors\n\nWe should not allow soft tasks to wait for longer than the major timeout\nperiod when waiting for a reconnect to occur.\n\nRemove the field xprt-\u003econnect_timeout since it has been obsoleted by\nxprt-\u003ereestablish_timeout.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "0b9e79431377df452348e78262dd5a3dc359eeef", "tree": "0a69324b177e2db40e88988b83e0782dd9d98990", "parents": [ "19445b99b6d66af661c586c052de23110731a502" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 16 16:41:57 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:29 2010 -0400" }, "message": "SUNRPC: Move the test for XPRT_CONNECTING into xprt_connect()\n\nThis fixes a bug with setting xprt-\u003estat.connect_start.\n\nReviewed-by: Chuck Lever \u003cchuck.lever@oracle.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "19445b99b6d66af661c586c052de23110731a502", "tree": "b5a77b701b466598af631ef5a7db705f6e7c59ad", "parents": [ "ee5ebe851ed60206f150d3f189416f9c63245b66" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 16 16:41:10 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:29 2010 -0400" }, "message": "SUNRPC: Cleanup - make rpc_new_task() call rpc_release_calldata on failure\n\nAlso have it return an ERR_PTR(-ENOMEM) instead of a null pointer.\n\nReviewed-by: Chuck Lever \u003cchuck.lever@oracle.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "ee5ebe851ed60206f150d3f189416f9c63245b66", "tree": "b73f04713c9ae381d40ad136cb60f9f3129d80f6", "parents": [ "fd86dfd2637db1aef9ebf96ba41aeedb87521e78" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 16 16:37:01 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:29 2010 -0400" }, "message": "SUNRPC: Clean up xprt_release()\n\nReviewed-by: Chuck Lever \u003cchuck.lever@oracle.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "fc54a0c65fc8cae6b0355512f0b619c1515e7d7f", "tree": "5e410cfc74d125dfffdb7e0abede169eacc452dd", "parents": [ "fffdaef2eb4a7333952e55cf97f1fc0fcc35f981" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Apr 08 14:25:20 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:21 2010 -0400" }, "message": "gss_krb5: Advertise rc4-hmac enctype support in the rpcsec_gss/krb5 upcall\n\nUpdate the upcall info indicating which Kerberos enctypes\nthe kernel supports\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "fffdaef2eb4a7333952e55cf97f1fc0fcc35f981", "tree": "bd4e4b39ec901feb27b91d33d4f52e723f3584d7", "parents": [ "5af46547ec451918f3ba51efe59b317d33adf701" ], "author": { "name": "Kevin Coffman", "email": "kwc@citi.umich.edu", "time": "Wed Mar 17 13:03:06 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:20 2010 -0400" }, "message": "gss_krb5: Add support for rc4-hmac encryption\n\nAdd necessary changes to add kernel support for the rc4-hmac Kerberos\nencryption type used by Microsoft and described in rfc4757.\n\nSigned-off-by: Kevin Coffman \u003ckwc@citi.umich.edu\u003e\nSigned-off-by: Steve Dickson \u003csteved@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "5af46547ec451918f3ba51efe59b317d33adf701", "tree": "0878529858a5ded9224e633dd13b431e6b69e28c", "parents": [ "1dbd9029f3024d058da1cf6c6658c28aac2e4e1c" ], "author": { "name": "Kevin Coffman", "email": "kwc@citi.umich.edu", "time": "Wed Mar 17 13:03:05 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:20 2010 -0400" }, "message": "gss_krb5: Use confounder length in wrap code\n\nAll encryption types use a confounder at the beginning of the\nwrap token. In all encryption types except arcfour-hmac, the\nconfounder is the same as the blocksize. arcfour-hmac has a\nblocksize of one, but uses an eight byte confounder.\n\nAdd an entry to the crypto framework definitions for the\nconfounder length and change the wrap/unwrap code to use\nthe confounder length rather than assuming it is always\nthe blocksize.\n\nSigned-off-by: Kevin Coffman \u003ckwc@citi.umich.edu\u003e\nSigned-off-by: Steve Dickson \u003csteved@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "1dbd9029f3024d058da1cf6c6658c28aac2e4e1c", "tree": "eb407d31f61ea8a14be6bb04aa09ed8980920025", "parents": [ "fc263a917afad3bda7b823a6edc803a40e7f6015" ], "author": { "name": "Kevin Coffman", "email": "kwc@citi.umich.edu", "time": "Wed Mar 17 13:03:04 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:20 2010 -0400" }, "message": "gssd_krb5: More arcfour-hmac support\n\nFor the arcfour-hmac support, the make_seq_num and get_seq_num\nfunctions need access to the kerberos context structure.\nThis will be used in a later patch.\n\nSigned-off-by: Kevin Coffman \u003ckwc@citi.umich.edu\u003e\nSigned-off-by: Steve Dickson \u003csteved@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "fc263a917afad3bda7b823a6edc803a40e7f6015", "tree": "c6773866431c48aea2b837f5ba06314ec21369b4", "parents": [ "8b23707612cffdba694dcd18aa8a018918aa86dc" ], "author": { "name": "Kevin Coffman", "email": "kwc@citi.umich.edu", "time": "Wed Mar 17 13:03:03 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:19 2010 -0400" }, "message": "gss_krb5: Save the raw session key in the context\n\nThis is needed for deriving arcfour-hmac keys \"on the fly\"\nusing the sequence number or checksu\n\nSigned-off-by: Kevin Coffman \u003ckwc@citi.umich.edu\u003e\nSigned-off-by: Steve Dickson \u003csteved@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "8b23707612cffdba694dcd18aa8a018918aa86dc", "tree": "3dd484658768c0a710b252a674c697124380b223", "parents": [ "bf6d359c508cf83401c942262a9749752598394d" ], "author": { "name": "Kevin Coffman", "email": "kwc@citi.umich.edu", "time": "Wed Mar 17 13:03:02 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:19 2010 -0400" }, "message": "gssd_krb5: arcfour-hmac support\n\nFor arcfour-hmac support, the make_checksum function needs a usage\nfield to correctly calculate the checksum differently for MIC and\nWRAP tokens.\n\nSigned-off-by: Kevin Coffman \u003ckwc@citi.umich.edu\u003e\nSigned-off-by: Steve Dickson \u003csteved@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "bf6d359c508cf83401c942262a9749752598394d", "tree": "b675fb082fb3e04438c1af2fa1f348cbe5d3747f", "parents": [ "934a95aa1c9c6ad77838800b79c306e982437605" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Apr 08 14:23:06 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:19 2010 -0400" }, "message": "gss_krb5: Advertise AES enctype support in the rpcsec_gss/krb5 upcall\n\nUpdate upcall info indicating which Kerberos enctypes\nthe kernel supports\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "934a95aa1c9c6ad77838800b79c306e982437605", "tree": "0f7000ffce214a156737fddc127fb0af238dfcff", "parents": [ "de9c17eb4a912c9028f7b470eb80815144883b26" ], "author": { "name": "Kevin Coffman", "email": "kwc@citi.umich.edu", "time": "Wed Mar 17 13:03:00 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:19 2010 -0400" }, "message": "gss_krb5: add remaining pieces to enable AES encryption support\n\nAdd the remaining pieces to enable support for Kerberos AES\nencryption types.\n\nSigned-off-by: Kevin Coffman \u003ckwc@citi.umich.edu\u003e\nSigned-off-by: Steve Dickson \u003csteved@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "de9c17eb4a912c9028f7b470eb80815144883b26", "tree": "3e681897cff2db43f91c1e5e2f7dcad9598165c9", "parents": [ "c43abaedaff92a7bcbfe04b593164bb5faba3078" ], "author": { "name": "Kevin Coffman", "email": "kwc@citi.umich.edu", "time": "Wed Mar 17 13:02:59 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:18 2010 -0400" }, "message": "gss_krb5: add support for new token formats in rfc4121\n\nThis is a step toward support for AES encryption types which are\nrequired to use the new token formats defined in rfc4121.\n\nSigned-off-by: Kevin Coffman \u003ckwc@citi.umich.edu\u003e\n[SteveD: Fixed a typo in gss_verify_mic_v2()]\nSigned-off-by: Steve Dickson \u003csteved@redhat.com\u003e\n[Trond: Got rid of the TEST_ROTATE/TEST_EXTRA_COUNT crap]\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "c43abaedaff92a7bcbfe04b593164bb5faba3078", "tree": "66cc5249854a8866e52445d7a6cd1dff70b71130", "parents": [ "4018bf3eec5ff6bf1234a602a4e72518757a7f55" ], "author": { "name": "Kevin Coffman", "email": "kwc@citi.umich.edu", "time": "Wed Mar 17 13:02:58 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:18 2010 -0400" }, "message": "xdr: Add an export for the helper function write_bytes_to_xdr_buf()\n\nSigned-off-by: Kevin Coffman \u003ckwc@citi.umich.edu\u003e\nSigned-off-by: Steve Dickson \u003csteved@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "4018bf3eec5ff6bf1234a602a4e72518757a7f55", "tree": "ef03a44f1331f2913d75ccfef081561530a6b26e", "parents": [ "958142e97e04d6c266ae093739bbbbd03afcd497" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Apr 08 14:21:12 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:18 2010 -0400" }, "message": "gss_krb5: Advertise triple-des enctype support in the rpcsec_gss/krb5 upcall\n\nUpdate the upcall info indicating which Kerberos enctypes the kernel\nsupports.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "958142e97e04d6c266ae093739bbbbd03afcd497", "tree": "f945fcf7105663bfccc124c347441268dcf06367", "parents": [ "683ac6656cb05b6e83593770ffc049eee4a4d119" ], "author": { "name": "Kevin Coffman", "email": "kwc@citi.umich.edu", "time": "Wed Mar 17 13:02:55 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:17 2010 -0400" }, "message": "gss_krb5: add support for triple-des encryption\n\nAdd the final pieces to support the triple-des encryption type.\n\nSigned-off-by: Kevin Coffman \u003ckwc@citi.umich.edu\u003e\nSigned-off-by: Steve Dickson \u003csteved@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "683ac6656cb05b6e83593770ffc049eee4a4d119", "tree": "531c849ad7b20ade79e69c8daa446d99722958ae", "parents": [ "47d84807762966c3611c38adecec6ea703ddda7a" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Apr 08 14:09:58 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:17 2010 -0400" }, "message": "gss_krb5: Add upcall info indicating supported kerberos enctypes\n\nThe text based upcall now indicates which Kerberos encryption types are\nsupported by the kernel rpcsecgss code. This is used by gssd to\ndetermine which encryption types it should attempt to negotiate\nwhen creating a context with a server.\n\nThe server principal\u0027s database and keytab encryption types are\nwhat limits what it should negotiate. Therefore, its keytab\nshould be created with only the enctypes listed by this file.\n\nCurrently we support des-cbc-crc, des-cbc-md4 and des-cbc-md5\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "47d84807762966c3611c38adecec6ea703ddda7a", "tree": "ac67fb9e29aa03e7eba58adae29e8db05fd35537", "parents": [ "4891f2d008e4343eedea39ba1fe74864f1d32be0" ], "author": { "name": "Kevin Coffman", "email": "kwc@citi.umich.edu", "time": "Wed Mar 17 13:02:54 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:17 2010 -0400" }, "message": "gss_krb5: handle new context format from gssd\n\nFor encryption types other than DES, gssd sends down context information\nin a new format. This new format includes the information needed to\nsupport the new Kerberos GSS-API tokens defined in rfc4121.\n\nSigned-off-by: Kevin Coffman \u003ckwc@citi.umich.edu\u003e\nSigned-off-by: Steve Dickson \u003csteved@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "4891f2d008e4343eedea39ba1fe74864f1d32be0", "tree": "6fb4048a44cd1c91f818ddc372d5410e59108bdb", "parents": [ "e1f6c07b1160ef28e8754d12e6c03288dd9d5ca8" ], "author": { "name": "Kevin Coffman", "email": "kwc@citi.umich.edu", "time": "Wed Mar 17 13:02:53 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:16 2010 -0400" }, "message": "gss_krb5: import functionality to derive keys into the kernel\n\nImport the code to derive Kerberos keys from a base key into the\nkernel. This will allow us to change the format of the context\ninformation sent down from gssd to include only a single key.\n\nSigned-off-by: Kevin Coffman \u003ckwc@citi.umich.edu\u003e\nSigned-off-by: Steve Dickson \u003csteved@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "e1f6c07b1160ef28e8754d12e6c03288dd9d5ca8", "tree": "5be1f97a1a51feaed4bed2b4a83a568c94921faf", "parents": [ "81d4a4333a1dfd6070f046265d928bb4c79aff88" ], "author": { "name": "Kevin Coffman", "email": "kwc@citi.umich.edu", "time": "Wed Mar 17 13:02:52 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:16 2010 -0400" }, "message": "gss_krb5: add ability to have a keyed checksum (hmac)\n\nEncryption types besides DES may use a keyed checksum (hmac).\nModify the make_checksum() function to allow for a key\nand take care of enctype-specific processing such as truncating\nthe resulting hash.\n\nSigned-off-by: Kevin Coffman \u003ckwc@citi.umich.edu\u003e\nSigned-off-by: Steve Dickson \u003csteved@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "81d4a4333a1dfd6070f046265d928bb4c79aff88", "tree": "652fce6cd75be7388f0cd5c45aec653814710791", "parents": [ "a8cc1cb7d7a12b0e2855832d10cfbfaffebfad6c" ], "author": { "name": "Kevin Coffman", "email": "kwc@citi.umich.edu", "time": "Wed Mar 17 13:02:51 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:16 2010 -0400" }, "message": "gss_krb5: introduce encryption type framework\n\nAdd enctype framework and change functions to use the generic\nvalues from it rather than the values hard-coded for des.\n\nSigned-off-by: Kevin Coffman \u003ckwc@citi.umich.edu\u003e\nSigned-off-by: Steve Dickson \u003csteved@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "a8cc1cb7d7a12b0e2855832d10cfbfaffebfad6c", "tree": "90a2816d677acfed392800ca032e4c23cabe2417", "parents": [ "1ac3719a2214c545c7e19d34e272a148ca9a24f1" ], "author": { "name": "Kevin Coffman", "email": "kwc@citi.umich.edu", "time": "Wed Mar 17 13:02:50 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:16 2010 -0400" }, "message": "gss_krb5: prepare for new context format\n\nPrepare for new context format by splitting out the old \"v1\"\ncontext processing function\n\nSigned-off-by: Kevin Coffman \u003ckwc@citi.umich.edu\u003e\nSigned-off-by: Steve Dickson \u003csteved@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "1ac3719a2214c545c7e19d34e272a148ca9a24f1", "tree": "ae1a3f88f85aad50c03cd0960b3fbc392561c673", "parents": [ "54ec3d462f3c2a3fe48a7bd592160bee31360087" ], "author": { "name": "Kevin Coffman", "email": "kwc@citi.umich.edu", "time": "Wed Mar 17 13:02:49 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:15 2010 -0400" }, "message": "gss_krb5: split up functions in preparation of adding new enctypes\n\nAdd encryption type to the krb5 context structure and use it to switch\nto the correct functions depending on the encryption type.\n\nSigned-off-by: Kevin Coffman \u003ckwc@citi.umich.edu\u003e\nSigned-off-by: Steve Dickson \u003csteved@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "54ec3d462f3c2a3fe48a7bd592160bee31360087", "tree": "4ae0027a9d40daed5d63b973c2f2895ddae45766", "parents": [ "7561042fb7870be0b4ee57efddce68bda8968abf" ], "author": { "name": "J. Bruce Fields", "email": "bfields@citi.umich.edu", "time": "Wed Mar 17 13:02:48 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:15 2010 -0400" }, "message": "gss_krb5: Don\u0027t expect blocksize to always be 8 when calculating padding\n\nSigned-off-by: Steve Dickson \u003csteved@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "7561042fb7870be0b4ee57efddce68bda8968abf", "tree": "8946703293d7904928f473f14f4e645f6d5be65a", "parents": [ "725f2865d4df31ac0768b13ae763beadc4bb8ce9" ], "author": { "name": "Kevin Coffman", "email": "kwc@citi.umich.edu", "time": "Wed Mar 17 13:02:47 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:15 2010 -0400" }, "message": "gss_krb5: Added and improved code comments\n\nSigned-off-by: Steve Dickson \u003csteved@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "725f2865d4df31ac0768b13ae763beadc4bb8ce9", "tree": "20b2da47713e7f38a61d37cbb2c95ad52c88609f", "parents": [ "4fc4c3ce0dc1096cbd0daa3fe8f6905cbec2b87e" ], "author": { "name": "Kevin Coffman", "email": "kwc@citi.umich.edu", "time": "Wed Mar 17 13:02:46 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri May 14 15:09:15 2010 -0400" }, "message": "gss_krb5: Introduce encryption type framework\n\nMake the client and server code consistent regarding the extra buffer\nspace made available for the auth code when wrapping data.\n\nAdd some comments/documentation about the available buffer space\nin the xdr_buf head and tail when gss_wrap is called.\n\nAdd a compile-time check to make sure we are not exceeding the available\nbuffer space.\n\nAdd a central function to shift head data.\n\nSigned-off-by: Kevin Coffman \u003ckwc@citi.umich.edu\u003e\nSigned-off-by: Steve Dickson \u003csteved@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "278554bd6579206921f5d8a523649a7a57f8850d", "tree": "4e6c527daf0910e455b3aa72e2c96b0479e430be", "parents": [ "5a147e8bf982f9dd414c1dd751fe02c1942506b2", "cea0d767c29669bf89f86e4aee46ef462d2ebae8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 12 00:05:35 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 12 00:05:35 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tDocumentation/feature-removal-schedule.txt\n\tdrivers/net/wireless/ath/ar9170/usb.c\n\tdrivers/scsi/iscsi_tcp.c\n\tnet/ipv4/ipmr.c\n" }, { "commit": "5306293c9cd2caf41849cc909281bda628bb989e", "tree": "3be4e8231e2772c8a43ddbef5c6a72c20b3054bb", "parents": [ "dbd65a7e44fff4741a0b2c84bd6bace85d22c242", "66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8" ], "author": { "name": "J. Bruce Fields", "email": "bfields@citi.umich.edu", "time": "Tue May 04 11:27:05 2010 -0400" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@citi.umich.edu", "time": "Tue May 04 11:29:05 2010 -0400" }, "message": "Merge commit \u0027v2.6.34-rc6\u0027\n\nConflicts:\n\tfs/nfsd/nfs4callback.c\n" }, { "commit": "b48fa6b99100dc7772af3cd276035fcec9719ceb", "tree": "415dba87c6c5de0ab85a8493f864838f4f3cc005", "parents": [ "26c0c75e69265961e891ed80b38fb62a548ab371" ], "author": { "name": "Neil Brown", "email": "neilb@suse.de", "time": "Mon Mar 01 16:51:14 2010 +1100" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@citi.umich.edu", "time": "Mon May 03 08:33:00 2010 -0400" }, "message": "sunrpc: centralise most calls to svc_xprt_received\n\nsvc_xprt_received must be called when -\u003expo_recvfrom has finished\nreceiving a message, so that the XPT_BUSY flag will be cleared and\nif necessary, requeued for further work.\n\nThis call is currently made in each -\u003expo_recvfrom function, often\nfrom multiple different points. In each case it is the earliest point\non a particular path where it is known that the protection provided by\nXPT_BUSY is no longer needed.\n\nHowever there are (still) some error paths which do not call\nsvc_xprt_received, and requiring each -\u003expo_recvfrom to make the call\ndoes not encourage robustness.\n\nSo: move the svc_xprt_received call to be made just after the\ncall to -\u003expo_recvfrom(), and move it of the various -\u003expo_recvfrom\nmethods.\n\nThis means that it may not be called at the earliest possible instant,\nbut this is unlikely to be a measurable performance issue.\n\nNote that there are still other calls to svc_xprt_received as it is\nalso needed when an xprt is newly created.\n\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\nSigned-off-by: J. Bruce Fields \u003cbfields@citi.umich.edu\u003e\n" }, { "commit": "3d7b08945e54a3a5358d5890240619a013cb7388", "tree": "fc255ee6b91875e623200aa5b3f59fe58cc3e456", "parents": [ "c81eddb0e3728661d1585fbc564449c94165cc36" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Apr 22 15:35:55 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Apr 22 15:35:55 2010 -0400" }, "message": "SUNRPC: Fix a bug in rpcauth_prune_expired\n\nDon\u0027t want to evict a credential if cred-\u003ecr_expire \u003d\u003d jiffies, since that\nmeans that it was just placed on the cred_unused list. We therefore need to\nuse time_in_range() rather than time_in_range_open().\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "87eb367003887cdc81a5d183efea227b5b488961", "tree": "40f617e25a9364d573e3cd2189c9e7fa56c8a0fe", "parents": [ "ccb7c7732e2ceb4e81a7806faf1670be9681ccd2", "05d17608a69b3ae653ea5c9857283bef3439c733" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 21 01:14:25 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 21 01:14:25 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/wireless/iwlwifi/iwl-6000.c\n\tnet/core/dev.c\n" }, { "commit": "0eae88f31ca2b88911ce843452054139e028771f", "tree": "90f50197d8e1e50e3621e9c525bd4ca2634fe368", "parents": [ "cb903bf4ee2d6e53210e2174d363e10698112042" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Apr 20 19:06:52 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 20 19:06:52 2010 -0700" }, "message": "net: Fix various endianness glitches\n\nSparse can help us find endianness bugs, but we need to make some\ncleanups to be able to more easily spot real bugs.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aa395145165cb06a0d0885221bbe0ce4a564391d", "tree": "118b0403621f10db8dc3dbf12079f9af5b19e05d", "parents": [ "ab9304717f7624c41927f442e6b6d418b2d8b3e4" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Apr 20 13:03:51 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 20 16:37:13 2010 -0700" }, "message": "net: sk_sleep() helper\n\nDefine a new function to return the waitqueue of a \"struct sock\".\n\nstatic inline wait_queue_head_t *sk_sleep(struct sock *sk)\n{\n\treturn sk-\u003esk_sleep;\n}\n\nChange all read occurrences of sk_sleep by a call to this function.\n\nNeeded for a future RCU conversion. sk_sleep wont be a field directly\navailable.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fedfb947b2235c1085df97cf52f688b808c3a515", "tree": "5eb0ffcd0eace60c7e206df6f33f9841b452f2b3", "parents": [ "44fa2b4bee5b07d506a7b002b4e2eb73654db7e0", "bade732a2848e640482c1e99629a90e085d574dd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 12 18:34:56 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 12 18:34:56 2010 -0700" }, "message": "Merge branch \u0027for-2.6.34\u0027 of git://linux-nfs.org/~bfields/linux\n\n* \u0027for-2.6.34\u0027 of git://linux-nfs.org/~bfields/linux:\n svcrdma: RDMA support not yet compatible with RPC6\n" }, { "commit": "871039f02f8ec4ab2e5e9010718caa8e085786f1", "tree": "f0d2b3127fc48c862967d68c46c2d46668137515", "parents": [ "e4077e018b5ead3de9951fc01d8bf12eeeeeefed", "4a1032faac94ebbf647460ae3e06fc21146eb280" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 11 14:53:53 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 11 14:53:53 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/stmmac/stmmac_main.c\n\tdrivers/net/wireless/wl12xx/wl1271_cmd.c\n\tdrivers/net/wireless/wl12xx/wl1271_main.c\n\tdrivers/net/wireless/wl12xx/wl1271_spi.c\n\tnet/core/ethtool.c\n\tnet/mac80211/scan.c\n" }, { "commit": "4a35ecf8bf1c4b039503fa554100fe85c761de76", "tree": "9b75f5d5636004d9a9aa496924377379be09aa1f", "parents": [ "b4d562e3c3553ac58c7120555c4e4aefbb090a2a", "fb9e2d887243499b8d28efcf80821c4f6a092395" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 06 23:53:30 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 06 23:53:30 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/bonding/bond_main.c\n\tdrivers/net/via-velocity.c\n\tdrivers/net/wireless/iwlwifi/iwl-agn.c\n" }, { "commit": "bade732a2848e640482c1e99629a90e085d574dd", "tree": "721ae2ac175ccbc15af2abb4fc288f352a453c73", "parents": [ "2eaa9cfdf33b8d7fb7aff27792192e0019ae8fc6" ], "author": { "name": "Tom Tucker", "email": "tom@ogc.us", "time": "Sat Apr 03 08:27:29 2010 -0500" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@citi.umich.edu", "time": "Mon Apr 05 12:10:22 2010 -0400" }, "message": "svcrdma: RDMA support not yet compatible with RPC6\n\nRPC6 requires that it be possible to create endpoints that listen\nexclusively for IPv4 or IPv6 connection requests. This is not currently\nsupported by the RDMA API.\n\nThis fixes a server RDMA regression introduced by 37498292a \"NFSD:\nCreate PF_INET6 listener in write_ports\".\n\nSigned-off-by: Tom Tucker\u003ctom@opengridcomputing.com\u003e\nTested-by: Steve Wise \u003cswise@opengridcomputing.com\u003e\nReviewed-by: Chuck Lever \u003cchuck.lever@oracle.com\u003e\nSigned-off-by: J. Bruce Fields \u003cbfields@citi.umich.edu\u003e\n" }, { "commit": "5a0e3ad6af8660be21ca98a971cd00f331318c05", "tree": "5bfb7be11a03176a87296a43ac6647975c00a1d1", "parents": [ "ed391f4ebf8f701d3566423ce8f17e614cde9806" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 24 17:04:11 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Mar 30 22:02:32 2010 +0900" }, "message": "include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h\n\npercpu.h is included by sched.h and module.h and thus ends up being\nincluded when building most .c files. percpu.h includes slab.h which\nin turn includes gfp.h making everything defined by the two files\nuniversally available and complicating inclusion dependencies.\n\npercpu.h -\u003e slab.h dependency is about to be removed. Prepare for\nthis change by updating users of gfp and slab facilities include those\nheaders directly instead of assuming availability. As this conversion\nneeds to touch large number of source files, the following script is\nused as the basis of conversion.\n\n http://userweb.kernel.org/~tj/misc/slabh-sweep.py\n\nThe script does the followings.\n\n* Scan files for gfp and slab usages and update includes such that\n only the necessary includes are there. ie. if only gfp is used,\n gfp.h, if slab is used, slab.h.\n\n* When the script inserts a new include, it looks at the include\n blocks and try to put the new include such that its order conforms\n to its surrounding. It\u0027s put in the include block which contains\n core kernel includes, in the same order that the rest are ordered -\n alphabetical, Christmas tree, rev-Xmas-tree or at the end if there\n doesn\u0027t seem to be any matching order.\n\n* If the script can\u0027t find a place to put a new include (mostly\n because the file doesn\u0027t have fitting include block), it prints out\n an error message indicating which .h file needs to be added to the\n file.\n\nThe conversion was done in the following steps.\n\n1. The initial automatic conversion of all .c files updated slightly\n over 4000 files, deleting around 700 includes and adding ~480 gfp.h\n and ~3000 slab.h inclusions. The script emitted errors for ~400\n files.\n\n2. Each error was manually checked. Some didn\u0027t need the inclusion,\n some needed manual addition while adding it to implementation .h or\n embedding .c file was more appropriate for others. This step added\n inclusions to around 150 files.\n\n3. The script was run again and the output was compared to the edits\n from #2 to make sure no file was left behind.\n\n4. Several build tests were done and a couple of problems were fixed.\n e.g. lib/decompress_*.c used malloc/free() wrappers around slab\n APIs requiring slab.h to be added manually.\n\n5. The script was run on all .h files but without automatically\n editing them as sprinkling gfp.h and slab.h inclusions around .h\n files could easily lead to inclusion dependency hell. Most gfp.h\n inclusion directives were ignored as stuff from gfp.h was usually\n wildly available and often used in preprocessor macros. Each\n slab.h inclusion directive was examined and added manually as\n necessary.\n\n6. percpu.h was updated not to include slab.h.\n\n7. Build test were done on the following configurations and failures\n were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my\n distributed build env didn\u0027t work with gcov compiles) and a few\n more options had to be turned off depending on archs to make things\n build (like ipr on powerpc/64 which failed due to missing writeq).\n\n * x86 and x86_64 UP and SMP allmodconfig and a custom test config.\n * powerpc and powerpc64 SMP allmodconfig\n * sparc and sparc64 SMP allmodconfig\n * ia64 SMP allmodconfig\n * s390 SMP allmodconfig\n * alpha SMP allmodconfig\n * um on x86_64 SMP allmodconfig\n\n8. percpu.h modifications were reverted so that it could be applied as\n a separate patch and serve as bisection point.\n\nGiven the fact that I had only a couple of failures from tests on step\n6, I\u0027m fairly confident about the coverage of this conversion patch.\nIf there is a breakage, it\u0027s likely to be something in one of the arch\nheaders which should be easily discoverable easily on most builds of\nthe specific arch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nGuess-its-ok-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\n" }, { "commit": "788e69e548cc8d127b90f0de1f7b7e983d1d587a", "tree": "b8312151a877978d579af189789e1f3f477f3a5f", "parents": [ "a5990ea1254cd186b38744507aeec3136a0c1c95" ], "author": { "name": "J. Bruce Fields", "email": "bfields@citi.umich.edu", "time": "Mon Mar 29 21:02:31 2010 -0400" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@citi.umich.edu", "time": "Mon Mar 29 21:02:31 2010 -0400" }, "message": "svcrpc: don\u0027t hold sv_lock over svc_xprt_put()\n\nsvc_xprt_put() can call tcp_close(), which can sleep, so we shouldn\u0027t be\nholding this lock.\n\nIn fact, only the xpt_list removal and the sv_tmpcnt decrement should\nneed the sv_lock here.\n\nReported-by: Mi Jinlong \u003cmijinlong@cn.fujitsu.com\u003e\nSigned-off-by: J. Bruce Fields \u003cbfields@citi.umich.edu\u003e\n" }, { "commit": "b138338056fc423c61a583d45f8aa64cfad87131", "tree": "89079c1f80c62a7fce240942605e869944c81a1e", "parents": [ "18062ca94714a66e75da8a22e010d0e8e61ab4cd" ], "author": { "name": "Frans Pop", "email": "elendil@planet.nl", "time": "Wed Mar 24 07:57:28 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 24 14:01:54 2010 -0700" }, "message": "net: remove trailing space in messages\n\nSigned-off-by: Frans Pop \u003celendil@planet.nl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a5990ea1254cd186b38744507aeec3136a0c1c95", "tree": "d194df4b090b30d28075ac02f39a3dbc10628a2f", "parents": [ "91885258e8343bb65c08f668d7e6c16563eb4284" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Thu Mar 11 14:08:10 2010 -0800" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@citi.umich.edu", "time": "Wed Mar 24 10:40:46 2010 -0400" }, "message": "sunrpc/cache: fix module refcnt leak in a failure path\n\nDon\u0027t forget to release the module refcnt if seq_open() returns failure.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: J. Bruce Fields \u003cbfields@fieldses.org\u003e\nCc: Neil Brown \u003cneilb@suse.de\u003e\nCc: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: J. Bruce Fields \u003cbfields@citi.umich.edu\u003e\n" }, { "commit": "f1f0abe192a72e75d7c59972e30784d043fd8d73", "tree": "ec805bee0fea179ad4b5e8a3d09e3ee0914a4186", "parents": [ "ff0901f8036a1586037c30a365c9666e946af0f1" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Sun Mar 21 12:10:34 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Mar 22 05:34:13 2010 -0400" }, "message": "sunrpc: handle allocation errors from __rpc_lookup_create()\n\n__rpc_lookup_create() can return ERR_PTR(-ENOMEM).\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "ff0901f8036a1586037c30a365c9666e946af0f1", "tree": "0ac6bf41e2d0837dfa7107052f741d78a08a6dd7", "parents": [ "c9acb42ef1904d15d0fb315061cefbe638f67f3a" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 19 16:17:45 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Mar 22 05:34:12 2010 -0400" }, "message": "SUNRPC: Fix the return value of rpc_run_bc_task()\n\nCurrently rpc_run_bc_task() will return NULL if the task allocation failed.\nHowever the only caller is bc_send, which assumes that the return value\nwill be an ERR_PTR.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "c9acb42ef1904d15d0fb315061cefbe638f67f3a", "tree": "7c94dff168dfc90a279990cb2860cce626ae76a3", "parents": [ "cdead7cf12896c0e50a8be2e52de52c364603095" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 19 15:36:22 2010 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Mar 22 05:32:44 2010 -0400" }, "message": "SUNRPC: Fix a use after free bug with the NFSv4.1 backchannel\n\nThe -\u003erelease_request() callback was designed to allow the transport layer\nto do housekeeping after the RPC call is done. It cannot be used to free\nthe request itself, and doing so leads to a use-after-free bug in\nxprt_release().\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" } ], "next": "cdead7cf12896c0e50a8be2e52de52c364603095" }