)]}' { "log": [ { "commit": "94de8b27d0dcb2608d56a7e5c2941b87e6da7ce3", "tree": "bd4b98e229bfbb9d6276e663b2eaca4c70b5bba1", "parents": [ "d6fb79d433d0a34c36bdf74eaf90857193a6261f" ], "author": { "name": "Andy Adamson", "email": "andros@netapp.com", "time": "Tue Mar 01 01:34:12 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 11 15:38:41 2011 -0500" }, "message": "NFSv4.1: add MDS mount DS only check\n\nThe DS only role cannot be used to mount.\n\nSigned-off-by: Andy Adamson \u003candros@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "d6fb79d433d0a34c36bdf74eaf90857193a6261f", "tree": "bf7686b2bd65d598ef1a4e5ceaebb0432302a726", "parents": [ "d3b4c9d76738df49a7db7682c2518a0ef9f7391d" ], "author": { "name": "Andy Adamson", "email": "andros@netapp.com", "time": "Tue Mar 01 01:34:11 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 11 15:38:41 2011 -0500" }, "message": "NFSv4.1: new flag for lease time check\n\nData servers cannot send nfs4_proc_get_lease_time. but still need to setup\nstate renewal. Add the NFS_CS_CHECK_LEASE_TIME bit to indicate if the lease\ntime can be checked.\n\nSigned-off-by: Andy Adamson \u003candros@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "d3b4c9d76738df49a7db7682c2518a0ef9f7391d", "tree": "69ab2ccad799bee8a00ad901b57739be44747fcd", "parents": [ "89d1ea65798953b251e399b17f32d31033889ae0" ], "author": { "name": "Andy Adamson", "email": "andros@netapp.com", "time": "Tue Mar 01 01:34:10 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 11 15:38:41 2011 -0500" }, "message": "NFSv4.1: new flag for state renewal check\n\nData servers not sharing a session with the mount MDS always have an empty\ncl_superblocks list.\nReplace the cl_superblocks empty list check to see if it is time to shut down\nrenewd with the NFS_CS_STOP_RENEW bit which is not set by such a data server.\n\nSigned-off-by: Andy Adamson \u003candros@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "89d1ea65798953b251e399b17f32d31033889ae0", "tree": "6ab0e98c1b9723539dca3c4879f705e486c2b497", "parents": [ "45a52a02072b2a7e265f024cfdb00127e08dd9f2" ], "author": { "name": "Andy Adamson", "email": "andros@netapp.com", "time": "Tue Mar 01 01:34:09 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 11 15:38:41 2011 -0500" }, "message": "NFSv4.1: send zero stateid seqid on v4.1 i/o\n\nData servers require a zero stateid seqid, and there is no advantage to not\ndoing the same for all NFSv4.1\n\nSigned-off-by: Andy Adamson \u003candros@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "45a52a02072b2a7e265f024cfdb00127e08dd9f2", "tree": "33c98f48d5b652297f45406f47d9545cca37c7c5", "parents": [ "bf9c1387ca80deac792c9ecf1c64dfcc5d1cc768" ], "author": { "name": "Andy Adamson", "email": "andros@netapp.com", "time": "Tue Mar 01 01:34:08 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 11 15:38:41 2011 -0500" }, "message": "NFS move nfs_client initialization into nfs_get_client\n\nNow nfs_get_client returns an nfs_client ready to be used no matter if it was\nfound or created.\n\nSigned-off-by: Andy Adamson \u003candros@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "bf9c1387ca80deac792c9ecf1c64dfcc5d1cc768", "tree": "4a06245d796db913a2a137d6498149e047a84283", "parents": [ "6f78befc417dd7122249706b49520da29ba58451" ], "author": { "name": "Andy Adamson", "email": "andros@netapp.com", "time": "Tue Mar 01 01:34:07 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 11 15:38:41 2011 -0500" }, "message": "NFSv4.1: put_layout_hdr can remove nfsi-\u003elayout\n\nPrevents an Oops triggered by CB_LAYOUTRECALL and LAYOUTGET race on a\npnfs_layout_hdr first pnfs_layout_segment.\n\nSigned-off-by: Andy Adamson \u003candros@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "6f78befc417dd7122249706b49520da29ba58451", "tree": "a1586909aa3ab42a924a142f3958776e47d51e6a", "parents": [ "136028967a283929c6f01518d0700b73fa622d56" ], "author": { "name": "Andy Adamson", "email": "andros@netapp.com", "time": "Tue Mar 01 01:34:06 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 11 15:38:41 2011 -0500" }, "message": "NFSv4: remove CONFIG_NFS_V4 from nfs_read_data\n\nCleanup nfs_read_data. We also won\u0027t use CONFIG_NFS_V4_1 for additional\nNFSv4.1 fields in subsequent patches.\n\nSigned-off-by: Andy Adamson \u003candros@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "136028967a283929c6f01518d0700b73fa622d56", "tree": "14c55e191897a726c6cedb09a988d2f07e0e3da4", "parents": [ "83762c56c1ba7c5b4b92fb32d570661633228bc6" ], "author": { "name": "Fred Isaman", "email": "iisaman@netapp.com", "time": "Fri Feb 11 15:42:38 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 11 15:38:40 2011 -0500" }, "message": "NFS: change nfs_writeback_done to return void\n\nThe return values are not used by any callers.\n\nSigned-off-by: Fred Isaman \u003ciisaman@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "83762c56c1ba7c5b4b92fb32d570661633228bc6", "tree": "96d0868be2b18efea6ffb1fe43c75b35db1be698", "parents": [ "eabf5baaaaf41b6a0273043cfb06d53dca67acef" ], "author": { "name": "Fred Isaman", "email": "iisaman@netapp.com", "time": "Fri Feb 11 15:42:37 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 11 15:38:40 2011 -0500" }, "message": "NFS: remove pointless if statement in nfs_direct_write_result\n\nThe code was doing nothing more in either branch of the if.\n\nSigned-off-by: Fred Isaman \u003ciisaman@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "eabf5baaaaf41b6a0273043cfb06d53dca67acef", "tree": "d3af759bccd76ecb3b1f1b5ec027193051b55734", "parents": [ "cee6a5372f8804f58acc87f07816f64db36718e2" ], "author": { "name": "Fred Isaman", "email": "iisaman@netapp.com", "time": "Fri Feb 11 15:42:36 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 11 15:38:40 2011 -0500" }, "message": "RPC: clarify rpc_run_task error handling\n\nrpc_run_task can only fail if it is not passed in a preallocated task.\nHowever, that is not at all clear with the current code. So\nremove several impossible to occur failure checks.\n\nSigned-off-by: Fred Isaman \u003ciisaman@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "cee6a5372f8804f58acc87f07816f64db36718e2", "tree": "66e07d4404e95fe7abcf60a9c72286328dd6a07f", "parents": [ "f49f9baac8f63de9cbc17a0a84e04060496e8e76" ], "author": { "name": "Fred Isaman", "email": "iisaman@netapp.com", "time": "Fri Feb 11 15:42:35 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 11 15:38:40 2011 -0500" }, "message": "RPC: remove check for impossible condition in rpc_make_runnable\n\nqueue_work() only returns 0 or 1, never a negative value.\n\nSigned-off-by: Fred Isaman \u003ciisaman@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "f49f9baac8f63de9cbc17a0a84e04060496e8e76", "tree": "e3e544247ec5e85c47915d34737f278772d15c73", "parents": [ "9f52c2525e09854ed6aa4cbd83915a56226d86c1" ], "author": { "name": "Fred Isaman", "email": "iisaman@netapp.com", "time": "Thu Feb 03 18:28:52 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 11 15:38:40 2011 -0500" }, "message": "pnfs: fix pnfs lock inversion of i_lock and cl_lock\n\nThe pnfs code was using throughout the lock order i_lock, cl_lock.\nThis conflicts with the nfs delegation code. Rework the pnfs code\nto avoid taking both locks simultaneously.\n\nCurrently the code takes the double lock to add/remove the layout to a\nnfs_client list, while atomically checking that the list of lsegs is\nempty. To avoid this, we rely on existing serializations. When a\nlayout is initialized with lseg count equal zero, LAYOUTGET\u0027s\nopenstateid serialization is in effect, making it safe to assume it\nstays zero unless we change it. And once a layout\u0027s lseg count drops\nto zero, it is set as DESTROYED and so will stay at zero.\n\nSigned-off-by: Fred Isaman \u003ciisaman@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "9f52c2525e09854ed6aa4cbd83915a56226d86c1", "tree": "9f1c873ed57e943c88d1f6fbb394dbbba0934a88", "parents": [ "38511722446993d926861696194c39ef135d85a4" ], "author": { "name": "Fred Isaman", "email": "iisaman@netapp.com", "time": "Thu Feb 03 18:28:51 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 11 15:38:40 2011 -0500" }, "message": "pnfs: do not need to clear NFS_LAYOUT_BULK_RECALL flag\n\nWe do not need to clear the NFS_LAYOUT_BULK_RECALL, as setting it\nguarantees that NFS_LAYOUT_DESTROYED will be set once any outstanding\nio is finished.\n\nSigned-off-by: Fred Isaman \u003ciisaman@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "38511722446993d926861696194c39ef135d85a4", "tree": "56ca01a34aea70cfc3473996bd3712cda3022166", "parents": [ "53d4737580535e073963b91ce87d4216e434fab5" ], "author": { "name": "Fred Isaman", "email": "iisaman@netapp.com", "time": "Thu Feb 03 18:28:50 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 11 15:38:39 2011 -0500" }, "message": "pnfs: avoid incorrect use of layout stateid\n\nThe code could violate the following from RFC5661, section 12.5.3:\n\"Once a client has no more layouts on a file, the layout stateid is no\nlonger valid and MUST NOT be used.\"\n\nThis can occur when a layout already has a lseg, starts another\nnon-everlapping LAYOUTGET, and a CB_LAYOUTRECALL for the existing lseg\nis processed before we hit pnfs_layout_process().\n\nSolve by setting, each time the client has no more lsegs for a file, a\nflag which blocks further use of the layout and triggers its removal.\n\nThis also fixes a second bug which occurs in the same instance as\nabove. If we actually use pnfs_layout_process, we add the new lseg to\nthe layout, but the layout has been removed from the nfs_client list\nby the intervening CB_LAYOUTRECALL and will not be added back. Thus\nthe newly acquired lseg will not be properly returned in the event of\na subsequent CB_LAYOUTRECALL.\n\nSigned-off-by: Fred Isaman \u003ciisaman@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "53d4737580535e073963b91ce87d4216e434fab5", "tree": "5dcecfe07d5f9ea1ec3a4b5678d8710c155ca340", "parents": [ "57df216bd8c8813a79a6a618e3d2ec937d532b86" ], "author": { "name": "Chuck Lever", "email": "chuck.lever@oracle.com", "time": "Fri Mar 11 15:31:06 2011 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 11 15:38:07 2011 -0500" }, "message": "NFS: NFSROOT should default to \"proto\u003dudp\"\n\nThere have been a number of recent reports that NFSROOT is no longer\nworking with default mount options, but fails only with certain NICs.\n\nBrian Downing \u003cbdowning@lavos.net\u003e bisected to commit 56463e50 \"NFS:\nUse super.c for NFSROOT mount option parsing\". Among other things,\nthis commit changes the default mount options for NFSROOT to use TCP\ninstead of UDP as the underlying transport.\n\nTCP seems less able to deal with NICs that are slow to initialize.\nThe system logs that have accompanied reports of problems all show\nthat NFSROOT attempts to establish a TCP connection before the NIC is\nfully initialized, and thus the TCP connection attempt fails.\n\nWhen a TCP connection attempt fails during a mount operation, the\nNFS stack needs to fail the operation. Usually user space knows how\nand when to retry it. The network layer does not report a distinct\nerror code for this particular failure mode. Thus, there isn\u0027t a\nclean way for the RPC client to see that it needs to retry in this\ncase, but not in others.\n\nBecause NFSROOT is used in some environments where it is not possible\nto update the kernel command line to specify \"udp\", the proper thing\nto do is change NFSROOT to use UDP by default, as it did before commit\n56463e50.\n\nTo make it easier to see how to change default mount options for\nNFSROOT and to distinguish default settings from mandatory settings,\nI\u0027ve adjusted a couple of areas to document the specifics.\n\nroot_nfs_cat() is also modified to deal with commas properly when\nconcatenating strings containing mount option lists. This keeps\nroot_nfs_cat() call sites simpler, now that we may be concatenating\nmultiple mount option strings.\n\nTested-by: Brian Downing \u003cbdowning@lavos.net\u003e\nTested-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Chuck Lever \u003cchuck.lever@oracle.com\u003e\nCc: \u003cstable@kernel.org\u003e # 2.6.37\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "57df216bd8c8813a79a6a618e3d2ec937d532b86", "tree": "ee3eddc164a7a1942a3239883336f90eeab6ee62", "parents": [ "f9feab1e180d1392f2f59d692826c6da2e57adf4" ], "author": { "name": "Huang Weiyi", "email": "weiyi.huang@gmail.com", "time": "Tue Mar 08 23:11:30 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 11 15:18:37 2011 -0500" }, "message": "nfs4: remove duplicated #include\n\nRemove duplicated #include(\u0027s) in\n fs/nfs/nfs4proc.c\n\nSigned-off-by: Huang Weiyi \u003cweiyi.huang@gmail.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "f9feab1e180d1392f2f59d692826c6da2e57adf4", "tree": "1af4e0012ddb1d74b0cd44fc4461bd5b78f5adf5", "parents": [ "ecac799a5ecc364006f0db6f2db15e77ed4d63e2" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Mar 09 16:12:46 2011 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 11 15:18:36 2011 -0500" }, "message": "NFSv4: nfs4_state_mark_reclaim_nograce() should be static\n\nThere are no more external users of nfs4_state_mark_reclaim_nograce() or\nnfs4_state_mark_reclaim_reboot(), so mark them as static.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "ecac799a5ecc364006f0db6f2db15e77ed4d63e2", "tree": "200a71e8c3d564bb26e31cda2c4283142c380ee7", "parents": [ "b4410c2f7f775b03da31566c05bb8d2383c7dc27" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Mar 09 16:00:56 2011 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 11 15:18:36 2011 -0500" }, "message": "NFSv4: Fix the setlk error handler\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "b4410c2f7f775b03da31566c05bb8d2383c7dc27", "tree": "7d16c41557c7aa17489a222a660ad71bd7fb370b", "parents": [ "0400a6b0cb756f976bae32ae8db47bfa9853897c" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Mar 09 16:00:55 2011 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 11 15:18:35 2011 -0500" }, "message": "NFSv4.1: Fix the handling of the SEQUENCE status bits\n\nWe want SEQUENCE status bits to be handled by the state manager in order\nto avoid threading issues.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "0400a6b0cb756f976bae32ae8db47bfa9853897c", "tree": "ec1393f7e5eeec02a0cc4504d98a138ae458f443", "parents": [ "c34c32ea97718bb24fc06158733580003ba89211" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Mar 09 16:00:53 2011 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Mar 11 15:18:22 2011 -0500" }, "message": "NFSv4/4.1: Fix nfs4_schedule_state_recovery abuses\n\nnfs4_schedule_state_recovery() should only be used when we need to force\nthe state manager to check the lease. If we just want to start the\nstate manager in order to handle a state recovery situation, we should be\nusing nfs4_schedule_state_manager().\n\nThis patch fixes the abuses of nfs4_schedule_state_recovery() by replacing\nits use with a set of helper functions that do the right thing.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "c34c32ea97718bb24fc06158733580003ba89211", "tree": "e11ca3f95ecc237499cd5d06f2377cc327c208b1", "parents": [ "114f64b5f24abac33a42f4f1856eb3a9766d497e" ], "author": { "name": "Andy Adamson", "email": "andros@netapp.com", "time": "Wed Mar 09 13:13:46 2011 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Mar 10 15:05:01 2011 -0500" }, "message": "NFSv4.1 reclaim complete must wait for completion\n\nSigned-off-by: Andy Adamson \u003candros@netapp.com\u003e\n[Trond: fix whitespace errors]\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "114f64b5f24abac33a42f4f1856eb3a9766d497e", "tree": "a3f5129bec4e2d7cf2afa0848798a5e74f422a3e", "parents": [ "7d6d63d6427090cbb1d282364b65b12634ca59bd" ], "author": { "name": "Andy Adamson", "email": "andros@netapp.com", "time": "Wed Mar 09 13:13:45 2011 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Mar 10 15:05:00 2011 -0500" }, "message": "NFSv4: remove duplicate clientid in struct nfs_client\n\nSigned-off-by: Andy Adamson \u003candros@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "7d6d63d6427090cbb1d282364b65b12634ca59bd", "tree": "b75f3278469f86453e8b90ced1a5c3698a9c4a93", "parents": [ "4cea288aaf0e11647880cc487350b1dc45d9febc" ], "author": { "name": "Ricardo Labiaga", "email": "Ricardo.Labiaga@netapp.com", "time": "Wed Mar 09 13:13:44 2011 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Mar 10 15:04:59 2011 -0500" }, "message": "NFSv4.1: Retry CREATE_SESSION on NFS4ERR_DELAY\n\nFix bug where we currently retry the EXCHANGEID call again, eventhough\nwe already have a valid clientid. Instead, delay and retry the CREATE_SESSION\ncall.\n\nSigned-off-by: Ricardo Labiaga \u003cRicardo.Labiaga@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "4cea288aaf0e11647880cc487350b1dc45d9febc", "tree": "6ea19d6d0b7b833f39077941a795f83b81448b36", "parents": [ "3fa0b4e201d254b52a251fa348bd53e53000cff6" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Feb 22 21:54:34 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Mar 10 15:04:58 2011 -0500" }, "message": "sunrpc: Propagate errors from xs_bind() through xs_create_sock()\n\nxs_create_sock() is supposed to return a pointer or an ERR_PTR-encoded\nerror, but it currently returns 0 if xs_bind() fails.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nCc: stable@kernel.org [v2.6.37]\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "3fa0b4e201d254b52a251fa348bd53e53000cff6", "tree": "ad5e41b45d5c8603901b34631b688ae5e3793942", "parents": [ "43b7c3f051dea504afccc39bcb56d8e26c2e0b77" ], "author": { "name": "Frank Filz", "email": "ffilzlnx@us.ibm.com", "time": "Thu Dec 02 19:31:23 2010 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Mar 10 15:04:58 2011 -0500" }, "message": "(try3-resend) Fix nfs_compat_user_ino64 so it doesn\u0027t cause problems if bit 31 or 63 are set in fileid\n\nThe problem was use of an int32, which when converted to a uint64\nis sign extended resulting in a fileid that doesn\u0027t fit in 32 bits\neven though the intent of the function is to fit the fileid into\n32 bits.\n\nSigned-off-by: Frank Filz \u003cffilzlnx@us.ibm.com\u003e\nReviewed-by: Jeff Layton \u003cjlayton@redhat.com\u003e\n[Trond: Added an include for compat.h]\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "43b7c3f051dea504afccc39bcb56d8e26c2e0b77", "tree": "6d031d1804acf9a5abeeb6b1597cb6821f96e493", "parents": [ "b9f810570d9cc13177128e11a74e22d37aa68a1a" ], "author": { "name": "Jovi Zhang", "email": "bookjovi@gmail.com", "time": "Wed Mar 02 23:19:37 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Mar 10 15:04:56 2011 -0500" }, "message": "nfs: fix compilation warning\n\nthis commit fix compilation warning as following:\nlinux-2.6/fs/nfs/nfs4proc.c:3265: warning: comparison of distinct pointer types lacks a cast\n\nSigned-off-by: Jovi Zhang \u003cbookjovi@gmail.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "b9f810570d9cc13177128e11a74e22d37aa68a1a", "tree": "91c120b297c357695ae4be5dcd373ce220d0dedd", "parents": [ "a5e502681007779d4762fb3ef7e80a3ecd1cfe6b" ], "author": { "name": "Stanislav Fomichev", "email": "kernel@fomichev.me", "time": "Sat Feb 05 23:13:01 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Mar 10 15:04:55 2011 -0500" }, "message": "nfs: add kmalloc return value check in decode_and_add_ds\n\nadd kmalloc return value check in decode_and_add_ds\n\nSigned-off-by: Stanislav Fomichev \u003ckernel@fomichev.me\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "a5e502681007779d4762fb3ef7e80a3ecd1cfe6b", "tree": "bfa3e8658e93fd8c64eff33cca5904c9f32ae055", "parents": [ "d2224e7afbf2a6556f4f8f25bc0e96d99ec4d2bd" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Sat Jan 22 21:40:20 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Mar 10 15:04:54 2011 -0500" }, "message": "SUNRPC: Remove resource leak in svc_rdma_send_error()\n\nWe leak the memory allocated to \u0027ctxt\u0027 when we return after\n\u0027ib_dma_mapping_error()\u0027 returns !\u003d0.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "d2224e7afbf2a6556f4f8f25bc0e96d99ec4d2bd", "tree": "e8eea0db32178870bee34073547b982216035e45", "parents": [ "bf294b41cefcb22fc3139e0f42c5b3f06728bd5e" ], "author": { "name": "Jeff Layton", "email": "jlayton@redhat.com", "time": "Sun Mar 06 17:14:13 2011 +0000" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Mar 10 15:04:53 2011 -0500" }, "message": "nfs: close NFSv4 COMMIT vs. CLOSE race\n\nI\u0027ve been adding in more artificial delays in the NFSv4 commit and close\ncodepaths to uncover races. The kernel I\u0027m testing has the patch to\nclose the race in __rpc_wait_for_completion_task that\u0027s in Trond\u0027s\ncthon2011 branch. The reproducer I\u0027ve been using does this in a loop:\n\n\tmkdir(\"DIR\");\n\tfd \u003d open(\"DIR/FILE\", O_WRONLY|O_CREAT|O_EXCL, 0644);\n\twrite(fd, \"abcdefg\", 7);\n\tclose(fd);\n\tunlink(\"DIR/FILE\");\n\trmdir(\"DIR\");\n\nThe above reproducer shouldn\u0027t result in any silly-renaming. However,\nwhen I add a \"msleep(100)\" just after the nfs_commit_clear_lock call in\nnfs_commit_release, I can almost always force one to occur. If I can\nforce it to occur with that, then it can happen without that delay\ngiven the right timing.\n\nnfs_commit_inode waits for the NFS_INO_COMMIT bit to clear when called\nwith FLUSH_SYNC set. nfs_commit_rpcsetup on the other hand does not wait\nfor the task to complete before putting its reference to it, so the last\nreference get put in rpc_release task and gets queued to a workqueue.\n\nIn this situation, the last open context reference may be put by the\nCOMMIT release instead of the close() syscall. The close() syscall\nreturns too quickly and the unlink runs while the d_count is still\nhigh since the COMMIT release hasn\u0027t put its dentry reference yet.\n\nFix this by having rpc_commit_rpcsetup wait for the RPC call to complete\nbefore putting the task reference when FLUSH_SYNC is set. With this, the\nlast reference is put by the process that\u0027s initiating the FLUSH_SYNC\ncommit and the race is closed.\n\nSigned-off-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "bf294b41cefcb22fc3139e0f42c5b3f06728bd5e", "tree": "250251c040a2d2e278b5a2ddd03c8d20a27be129", "parents": [ "214d93b02c4fe93638ad268613c9702a81ed9192" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Feb 21 11:05:41 2011 -0800" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Mar 10 15:04:52 2011 -0500" }, "message": "SUNRPC: Close a race in __rpc_wait_for_completion_task()\n\nAlthough they run as rpciod background tasks, under normal operation\n(i.e. no SIGKILL), functions like nfs_sillyrename(), nfs4_proc_unlck()\nand nfs4_do_close() want to be fully synchronous. This means that when we\nexit, we want all references to the rpc_task to be gone, and we want\nany dentry references etc. held by that task to be released.\n\nFor this reason these functions call __rpc_wait_for_completion_task(),\nfollowed by rpc_put_task() in the expectation that the latter will be\nreleasing the last reference to the rpc_task, and thus ensuring that the\ncallback_ops-\u003erpc_release() has been called synchronously.\n\nThis patch fixes a race which exists due to the fact that\nrpciod calls rpc_complete_task() (in order to wake up the callers of\n__rpc_wait_for_completion_task()) and then subsequently calls\nrpc_put_task() without ensuring that these two steps are done atomically.\n\nIn order to avoid adding new spin locks, the patch uses the existing\nwaitqueue spin lock to order the rpc_task reference count releases between\nthe waiting process and rpciod.\nThe common case where nobody is waiting for completion is optimised for by\nchecking if the RPC_TASK_ASYNC flag is cleared and/or if the rpc_task\nreference count is 1: in those cases we drop trying to grab the spin lock,\nand immediately free up the rpc_task.\n\nThose few processes that need to put the rpc_task from inside an\nasynchronous context and that do not care about ordering are given a new\nhelper: rpc_put_task_async().\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "214d93b02c4fe93638ad268613c9702a81ed9192", "tree": "a86cbf70b48112bf00933fddc123d147a2de4275", "parents": [ "ad4a4a82d176962ea706db555b29821af0b4dd45", "077f8ec889bb1eb26a7128fdbc75922755ed2320" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 07 13:15:02 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 07 13:15:02 2011 -0800" }, "message": "Merge branch \u0027omap-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6\n\n* \u0027omap-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:\n omap: mailbox: resolve hang issue\n OMAP2+: PM: SmartReflex: fix memory leaks in Smartreflex driver\n arm: mach-omap2: smartreflex: fix another memory leak\n" }, { "commit": "ad4a4a82d176962ea706db555b29821af0b4dd45", "tree": "f7b9c8dc86fc9de64211c7cc4af911e9e2e08bf9", "parents": [ "6277d53a9ff34ecd3837690b243aa8c8c993898d", "0c2bd9b24e73287aa4ee87844c847205e0da8a9b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 07 13:14:19 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 07 13:14:19 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6\n\n* \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6:\n [S390] tape: deadlock on system work queue\n [S390] keyboard: integer underflow bug\n [S390] xpram: remove __initdata attribute from module parameters\n" }, { "commit": "6277d53a9ff34ecd3837690b243aa8c8c993898d", "tree": "e0e737357cadbb08efee0bc60c5e1506f150dc4d", "parents": [ "d7a62cd0332115d4c7c4689abea0d889a30d8349", "2133991d58703aa5986e3789a7ae338bb45f2894" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 06 10:44:49 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 06 10:44:49 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:\n ALSA: hda - Don\u0027t set to D3 in Cirrus errata init verbs\n ALSA: hda - add new Fermi 5xx codec IDs to snd-hda\n ASoC: WM8994: Ensure late enable events are processed for the ADCs\n ASoC: WM8994: Don\u0027t disable the AIF[1|2]CLK_ENA unconditionaly\n ASoC: Fix WM9081 platform data initialisation\n ALSA: hda - Fix unable to record issue on ASUS N82JV\n ALSA: HDA: Realtek: Fixup jack detection to input subsystem\n" }, { "commit": "d7a62cd0332115d4c7c4689abea0d889a30d8349", "tree": "ced474d2ff1959576ac55f760bbafbe1073af11a", "parents": [ "fb62c00a6d8942775abc23d1621db1252e2d93d1" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Fri Mar 04 14:04:33 2011 +1030" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 06 10:44:13 2011 -0800" }, "message": "virtio: console: Don\u0027t access vqs if device was unplugged\n\nIf a virtio-console device gets unplugged while a port is open, a\nsubsequent close() call on the port accesses vqs to free up buffers.\nThis can lead to a crash.\n\nThe buffers are already freed up as a result of the call to\nunplug_ports() from virtcons_remove(). The fix is to simply not access\nvq information if port-\u003eportdev is NULL.\n\nReported-by: juzhang \u003cjuzhang@redhat.com\u003e\nCC: stable@kernel.org\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2133991d58703aa5986e3789a7ae338bb45f2894", "tree": "081a75299bbb3f74ad742fe1b0d4a1c5df86cb9b", "parents": [ "38c07641905c0db58e800ea974cd9158717c6610", "04d286819ba499839d04cbf847f2ea28d5cf4296" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Sun Mar 06 12:37:42 2011 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Sun Mar 06 12:37:42 2011 +0100" }, "message": "Merge branch \u0027fix/asoc\u0027 into for-linus\n" }, { "commit": "fb62c00a6d8942775abc23d1621db1252e2d93d1", "tree": "ef8760123f5a2b692126ecb7a70f2689053885c1", "parents": [ "5c4b4be3b6b937256103a5ae49177e0c3a17cb8f", "455cec0abff563574cca432ced49f734117ca113" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 05 10:43:22 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 05 10:43:22 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:\n ceph: no .snap inside of snapped namespace\n libceph: fix msgr standby handling\n libceph: fix msgr keepalive flag\n libceph: fix msgr backoff\n libceph: retry after authorization failure\n libceph: fix handling of short returns from get_user_pages\n ceph: do not clear I_COMPLETE from d_release\n ceph: do not set I_COMPLETE\n Revert \"ceph: keep reference to parent inode on ceph_dentry\"\n" }, { "commit": "5c4b4be3b6b937256103a5ae49177e0c3a17cb8f", "tree": "f0b7a74e61af26576e48581b70b7bad0a82d0ee7", "parents": [ "19ee151e140daa5183c4984981801e542e0544fb" ], "author": { "name": "Andi Kleen", "email": "ak@linux.intel.com", "time": "Fri Mar 04 17:36:32 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 17:53:39 2011 -0800" }, "message": "mm: use correct numa policy node for transparent hugepages\n\nPass down the correct node for a transparent hugepage allocation. Most\ncallers continue to use the current node, however the hugepaged daemon\nnow uses the previous node of the first to be collapsed page instead.\nThis ensures that khugepaged does not mess up local memory for an\nexisting process which uses local policy.\n\nThe choice of node is somewhat primitive currently: it just uses the\nnode of the first page in the pmd range. An alternative would be to\nlook at multiple pages and use the most popular node. I used the\nsimplest variant for now which should work well enough for the case of\nall pages being on the same node.\n\n[akpm@linux-foundation.org: coding-style fixes]\nAcked-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "19ee151e140daa5183c4984981801e542e0544fb", "tree": "a3fbc4d50bec3a52dd90211e78289542f4b930ef", "parents": [ "236344d6b417d05a3080477639234fd9ca97568d" ], "author": { "name": "Andi Kleen", "email": "ak@linux.intel.com", "time": "Fri Mar 04 17:36:31 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 17:53:39 2011 -0800" }, "message": "mm: preserve original node for transparent huge page copies\n\nThis makes a difference for LOCAL policy, where the node cannot be\ndetermined from the policy itself, but has to be gotten from the original\npage.\n\nAcked-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "236344d6b417d05a3080477639234fd9ca97568d", "tree": "bebda56cddb3dc7ce6f73091383ac857606a5f11", "parents": [ "2f5f9486f8c12e3aa40fe3775a18cb14efc5cea2" ], "author": { "name": "Andi Kleen", "email": "ak@linux.intel.com", "time": "Fri Mar 04 17:36:30 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 17:53:39 2011 -0800" }, "message": "mm: add alloc_page_vma_node()\n\nAdd a alloc_page_vma_node that allows passing the \"local\" node in. Used\nin a followon patch.\n\nAcked-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2f5f9486f8c12e3aa40fe3775a18cb14efc5cea2", "tree": "362c21544db1bc65ffb65abf9f2b41b63621a124", "parents": [ "b8bc1dd39722f7c306435d0682e9bf81abf52105" ], "author": { "name": "Andi Kleen", "email": "ak@linux.intel.com", "time": "Fri Mar 04 17:36:29 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 17:53:39 2011 -0800" }, "message": "mm: change alloc_pages_vma to pass down the policy node for local policy\n\nCurrently alloc_pages_vma() always uses the local node as policy node for\nthe LOCAL policy. Pass this node down as an argument instead.\n\nNo behaviour change from this patch, but will be needed for followons.\n\nAcked-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b8bc1dd39722f7c306435d0682e9bf81abf52105", "tree": "e2fc371fe1ee2db0881186283fb0618b4cd94718", "parents": [ "9dab51daef2e4a0d18d7824e23fcb64a2a86481d" ], "author": { "name": "Alexandre Bounine", "email": "alexandre.bounine@idt.com", "time": "Fri Mar 04 17:36:28 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 17:53:38 2011 -0800" }, "message": "RapidIO: Update MAINTAINERS\n\nSigned-off-by: Alexandre Bounine \u003calexandre.bounine@idt.com\u003e\nCc: Matt Porter \u003cmporter@kernel.crashing.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9dab51daef2e4a0d18d7824e23fcb64a2a86481d", "tree": "0945888ed34afe58e5605be4723bf54da4767624", "parents": [ "10ffa96407b230ea7fc72abd32c6795183f38fa1" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Fri Mar 04 17:36:27 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 17:53:38 2011 -0800" }, "message": "drivers/video/backlight/ltv350qv.c: fix a memory leak\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@atmel.com\u003e\nCc: Richard Purdie \u003crpurdie@rpsys.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "10ffa96407b230ea7fc72abd32c6795183f38fa1", "tree": "21edf32d23bbe6ccac7ddfe6772aac6e4d24d306", "parents": [ "95b90afec301f050f72740e8696f7cce8a37db5a" ], "author": { "name": "Kyungmin Park", "email": "kyungmin.park@samsung.com", "time": "Fri Mar 04 17:36:26 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 17:53:38 2011 -0800" }, "message": "MAINTAINERS: add maintainer of Samsung Mobile Machine support\n\nAdd maintainer of Samsung Mobile machine support. Currently, Aquila,\nGoni, Universal (C210), and Nuri board are supported.\n\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "95b90afec301f050f72740e8696f7cce8a37db5a", "tree": "bc98958028124b09037f3da11b395f0e6a3c1579", "parents": [ "97e419a082461f8a3a0818834eb88ad41219a1da" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Mar 04 17:36:23 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 17:53:38 2011 -0800" }, "message": "pps: make pps_gen_parport depend on BROKEN\n\nThis driver causes hard lockups, when the active clock soure is jiffies.\n\nThe reason is that it loops with interrupts disabled waiting for a\ntimestamp to be reached by polling getnstimeofday(). Though with a\njiffies clocksource, when that code runs on the same CPU which is\nresponsible for updating jiffies, then we loop in circles for ever\nsimply because the timer interrupt cannot update jiffies. So both UP\nand SMP can be affected.\n\nThere is no easy fix for that problem so make it depend on BROKEN for\nnow.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Alexander Gordeev \u003clasaine@lvk.cs.msu.su\u003e\nCc: Rodolfo Giometti \u003cgiometti@linux.it\u003e\nCc: john stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "97e419a082461f8a3a0818834eb88ad41219a1da", "tree": "e83b8940e221ab456fd842336b6a70b3b5f3c90e", "parents": [ "b75f38d659e6fc747eda64cb72f3920e29dd44a4" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Fri Mar 04 17:36:22 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 17:53:38 2011 -0800" }, "message": "drivers/misc/bmp085.c: add MODULE_DEVICE_TABLE\n\nThe device table is required to load modules based on modaliases.\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nCc: Shubhrajyoti D \u003cshubhrajyoti@ti.com\u003e\nCc: Christoph Mair \u003cchristoph.mair@gmail.com\u003e\nCc: Jonathan Cameron \u003cjic23@cam.ac.uk\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b75f38d659e6fc747eda64cb72f3920e29dd44a4", "tree": "308edc066f8c26991323526d499eefa8c773f267", "parents": [ "2ec38a0359e227c01080dcd670a0368c61ccd9ce" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Fri Mar 04 17:36:21 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 17:53:38 2011 -0800" }, "message": "cpuset: add a missing unlock in cpuset_write_resmask()\n\nDon\u0027t forget to release cgroup_mutex if alloc_trial_cpuset() fails.\n\n[akpm@linux-foundation.org: avoid multiple return points]\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Paul Menage \u003cmenage@google.com\u003e\nAcked-by: David Rientjes \u003crientjes@google.com\u003e\nCc: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2ec38a0359e227c01080dcd670a0368c61ccd9ce", "tree": "6752b17f6c7333efed5018b18f8fc12dfdd933bb", "parents": [ "212e3499b2c69cc0899422973310e610d1c0666f" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Fri Mar 04 17:36:19 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 17:53:38 2011 -0800" }, "message": "drivers/rtc/rtc-s3c.c: fix prototype for s3c_rtc_setaie()\n\nFix s3c_rtc_setaie() prototype to eliminate the following compile\nwarning:\n\n drivers/rtc/rtc-s3c.c:383: warning: initialization from incompatible pointer type\n\n(akpm: the rtc_class_ops.alarm_irq_enable() handler is being passed two\narguments where it expects just one, presumably with undesired effects)\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "212e3499b2c69cc0899422973310e610d1c0666f", "tree": "f0d314a0fa6e4a49dea50504be27ecfa38a932a0", "parents": [ "971a967bce2639d802b988522ee43be576549f35", "be1229b4c52202033ba857e96e592777f08e8046" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 17:31:43 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 17:31:43 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:\n Blackfin: iflush: update anomaly 05000491 workaround\n Blackfin: outs[lwb]: make sure count is greater than 0\n" }, { "commit": "971a967bce2639d802b988522ee43be576549f35", "tree": "497af10cca18b03892c9f3572db7719b954ff951", "parents": [ "f0678f3237b0e3ff8365dbe868b6f0e1af89fd0e", "2c34e939f9e98bb678a2b0d35e7a318bf2947024" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 17:31:19 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 17:31:19 2011 -0800" }, "message": "Merge branch \u0027rmobile-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6\n\n* \u0027rmobile-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:\n ARM: mach-shmobile: mackerel: modify LCDC clock divider value\n ARM: mach-shmobile: ap4evb: modify LCDC clock divider value\n ARM: mach-shmobile: mackerel: fixup memory initialize for zboot\n ARM: mach-shmobile: ap4evb: fixup memory initialize for zboot\n ARM: mach-shmobile: Add sh73a0 MIPI-CSI and CEU clocks\n ARM: mach-shmobile: AG5EVM MIPI-DSI LCD reset delay fix\n" }, { "commit": "f0678f3237b0e3ff8365dbe868b6f0e1af89fd0e", "tree": "200084e43bd60adc48fccd938667d9798f844bab", "parents": [ "be91bfebf2940054e40850928d97859142b86556", "d60cf53a30956e47919788b2ef49287786a959c9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 17:31:01 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 17:31:01 2011 -0800" }, "message": "Merge branch \u0027sh-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6\n\n* \u0027sh-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:\n sh: Change __nosave_XXX symbols to long\n sh: Flush executable pages in copy_user_highpage\n sh: Ensure ST40-300 BogoMIPS value is consistent\n sh: sh7750: Fix incompatible pointer type\n sh: sh7750: move machtypes.h to include/generated\n" }, { "commit": "be91bfebf2940054e40850928d97859142b86556", "tree": "4e48d3028892e35228b7073c44fc0243bb42ebf6", "parents": [ "e9e3d724e2145f5039b423c290ce2b2c3d8f94bc", "73412c3854c877e5f37ad944ee8977addde4d35a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 17:30:32 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 17:30:32 2011 -0800" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm/nouveau: allocate kernel\u0027s notifier object at end of block\n" }, { "commit": "e9e3d724e2145f5039b423c290ce2b2c3d8f94bc", "tree": "9b0ff4de361fe358a5a2400b35a48206688b5f71", "parents": [ "3256f80fbbc25bd2504bd564844c615227621e56" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Fri Mar 04 19:26:03 2011 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 17:28:52 2011 -0800" }, "message": "nfs4: Ensure that ACL pages sent over NFS were not allocated from the slab (v3)\n\nThe \"bad_page()\" page allocator sanity check was reported recently (call\nchain as follows):\n\n bad_page+0x69/0x91\n free_hot_cold_page+0x81/0x144\n skb_release_data+0x5f/0x98\n __kfree_skb+0x11/0x1a\n tcp_ack+0x6a3/0x1868\n tcp_rcv_established+0x7a6/0x8b9\n tcp_v4_do_rcv+0x2a/0x2fa\n tcp_v4_rcv+0x9a2/0x9f6\n do_timer+0x2df/0x52c\n ip_local_deliver+0x19d/0x263\n ip_rcv+0x539/0x57c\n netif_receive_skb+0x470/0x49f\n :virtio_net:virtnet_poll+0x46b/0x5c5\n net_rx_action+0xac/0x1b3\n __do_softirq+0x89/0x133\n call_softirq+0x1c/0x28\n do_softirq+0x2c/0x7d\n do_IRQ+0xec/0xf5\n default_idle+0x0/0x50\n ret_from_intr+0x0/0xa\n default_idle+0x29/0x50\n cpu_idle+0x95/0xb8\n start_kernel+0x220/0x225\n _sinittext+0x22f/0x236\n\nIt occurs because an skb with a fraglist was freed from the tcp\nretransmit queue when it was acked, but a page on that fraglist had\nPG_Slab set (indicating it was allocated from the Slab allocator (which\nmeans the free path above can\u0027t safely free it via put_page.\n\nWe tracked this back to an nfsv4 setacl operation, in which the nfs code\nattempted to fill convert the passed in buffer to an array of pages in\n__nfs4_proc_set_acl, which gets used by the skb-\u003efrags list in\nxs_sendpages. __nfs4_proc_set_acl just converts each page in the buffer\nto a page struct via virt_to_page, but the vfs allocates the buffer via\nkmalloc, meaning the PG_slab bit is set. We can\u0027t create a buffer with\nkmalloc and free it later in the tcp ack path with put_page, so we need\nto either:\n\n1) ensure that when we create the list of pages, no page struct has\n PG_Slab set\n\n or\n\n2) not use a page list to send this data\n\nGiven that these buffers can be multiple pages and arbitrarily sized, I\nthink (1) is the right way to go. I\u0027ve written the below patch to\nallocate a page from the buddy allocator directly and copy the data over\nto it. This ensures that we have a put_page free-able page for every\nentry that winds up on an skb frag list, so it can be safely freed when\nthe frame is acked. We do a put page on each entry after the\nrpc_call_sync call so as to drop our own reference count to the page,\nleaving only the ref count taken by tcp_sendpages. This way the data\nwill be properly freed when the ack comes in\n\nSuccessfully tested by myself to solve the above oops.\n\nNote, as this is the result of a setacl operation that exceeded a page\nof data, I think this amounts to a local DOS triggerable by an\nuprivlidged user, so I\u0027m CCing security on this as well.\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nCC: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCC: security@kernel.org\nCC: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "455cec0abff563574cca432ced49f734117ca113", "tree": "594e8dd5ac6c48a97836e5ca1e6ce451e157f2a2", "parents": [ "e00de341fdb76c955703b4438100f9933c452b7f" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Thu Mar 03 13:44:35 2011 -0800" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Fri Mar 04 12:25:09 2011 -0800" }, "message": "ceph: no .snap inside of snapped namespace\n\nOtherwise you can do things like\n\n# mkdir .snap/foo\n# cd .snap/foo/.snap\n# ls\n\u003cbadness\u003e\n\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "e00de341fdb76c955703b4438100f9933c452b7f", "tree": "ab776a5e46f1cb5acaa6b26484763259040f470c", "parents": [ "e76661d0a59e53e5cc4dccbe4b755d1dc8a968ec" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Fri Mar 04 12:25:05 2011 -0800" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Fri Mar 04 12:25:05 2011 -0800" }, "message": "libceph: fix msgr standby handling\n\nThe standby logic used to be pretty dependent on the work requeueing\nbehavior that changed when we switched to WQ_NON_REENTRANT. It was also\nvery fragile.\n\nRestructure things so that:\n - We clear WRITE_PENDING when we set STANDBY. This ensures we will\n requeue work when we wake up later.\n - con_work backs off if STANDBY is set. There is nothing to do if we are\n in standby.\n - clear_standby() helper is called by both con_send() and con_keepalive(),\n the two actions that can wake us up again. Move the connect_seq++\n logic here.\n\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "e76661d0a59e53e5cc4dccbe4b755d1dc8a968ec", "tree": "371ed08c5d00dbcdcf6f18e5cf36d798bcc51180", "parents": [ "60bf8bf8815e6adea4c1d0423578c3b8000e2ec8" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Thu Mar 03 10:10:15 2011 -0800" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Fri Mar 04 12:24:31 2011 -0800" }, "message": "libceph: fix msgr keepalive flag\n\nThere was some broken keepalive code using a dead variable. Shift to using\nthe proper bit flag.\n\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "60bf8bf8815e6adea4c1d0423578c3b8000e2ec8", "tree": "ce7140c32a3f177816f4029a88eb99e15bda6943", "parents": [ "692d20f576fb26f62c83f80dbf3ea899998391b7" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Fri Mar 04 12:24:28 2011 -0800" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Fri Mar 04 12:24:28 2011 -0800" }, "message": "libceph: fix msgr backoff\n\nWith commit f363e45f we replaced a bunch of hacky workqueue mutual\nexclusion logic with the WQ_NON_REENTRANT flag. One pieces of fallout is\nthat the exponential backoff breaks in certain cases:\n\n * con_work attempts to connect.\n * we get an immediate failure, and the socket state change handler queues\n immediate work.\n * con_work calls con_fault, we decide to back off, but can\u0027t queue delayed\n work.\n\nIn this case, we add a BACKOFF bit to make con_work reschedule delayed work\nnext time it runs (which should be immediately).\n\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "3256f80fbbc25bd2504bd564844c615227621e56", "tree": "1b6cadf49e25251b72c931a162ae31fef24dd405", "parents": [ "e3e89cc535223433a619d0969db3fa05cdd946b8" ], "author": { "name": "Dave Kleikamp", "email": "shaggy@kernel.org", "time": "Fri Mar 04 10:13:47 2011 -0600" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 10:44:06 2011 -0800" }, "message": "MAINTAINERS: Update shaggy\u0027s email address\n\nSigned-off-by: Dave Kleikamp \u003cshaggy@kernel.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e3e89cc535223433a619d0969db3fa05cdd946b8", "tree": "a0026ecf98617b7a7ab000339ed79a06ec03d038", "parents": [ "b65a0e0c84cf489bfa00d6aa6c48abc5a237100f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 09:23:30 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 04 09:23:30 2011 -0800" }, "message": "Mark ptrace_{traceme,attach,detach} static\n\nThey are only used inside kernel/ptrace.c, and have been for a long\ntime. We don\u0027t want to go back to the bad-old-days when architectures\ndid things on their own, so make them static and private.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "be1229b4c52202033ba857e96e592777f08e8046", "tree": "f0b015ca5dc831d42b640387c1168a5217d5f4b9", "parents": [ "bb7b11290afd2a192d33c357a2a62cb8eaf29eab" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Wed Feb 02 01:55:22 2011 +0000" }, "committer": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Fri Mar 04 01:27:01 2011 -0500" }, "message": "Blackfin: iflush: update anomaly 05000491 workaround\n\nRecent feedback from design says we need three NOPs in the hardware loop.\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\n" }, { "commit": "bb7b11290afd2a192d33c357a2a62cb8eaf29eab", "tree": "26713e5fb62a4950f485890157696620aba13d0b", "parents": [ "b65a0e0c84cf489bfa00d6aa6c48abc5a237100f" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Wed Jan 26 18:10:44 2011 +0000" }, "committer": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Fri Mar 04 01:26:55 2011 -0500" }, "message": "Blackfin: outs[lwb]: make sure count is greater than 0\n\nSome devices will use the outs* funcs with a length of zero, so make sure\nwe do not write any data in that case.\n\nReported-by: Gilbert Inho \u003cgneny@edevice.com\u003e\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\n" }, { "commit": "2c34e939f9e98bb678a2b0d35e7a318bf2947024", "tree": "d7c431238a01381ff33703a6ff6ebeddc2ea487f", "parents": [ "f60cb470eab2f06e0facb8d86a769e9c0a220e28" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Wed Mar 02 09:05:21 2011 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Mar 04 15:01:29 2011 +0900" }, "message": "ARM: mach-shmobile: mackerel: modify LCDC clock divider value\n\nmackerel WVGA LCDC panel expect 33.3MHz for dot-clock,\nbut current dot-clock was 50.0MHz.\nThis patch modify clock divider value.\n\nSigned-off-by: Makoto Ueda \u003cmakoto.ueda.ub@renesas.com\u003e\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "f60cb470eab2f06e0facb8d86a769e9c0a220e28", "tree": "902d5c483f9535d86b5b4d12930b1137e99fdd7c", "parents": [ "0acb6209a2443797cf2e15b3d978a03efa0765a3" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Wed Mar 02 09:05:44 2011 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Mar 04 15:01:13 2011 +0900" }, "message": "ARM: mach-shmobile: ap4evb: modify LCDC clock divider value\n\nap4evb WVGA LCDC panel expect 33.3MHz for dot-clock,\nbut current dot-clock was 50.0MHz.\nThis patch modify clock divider value.\n\nSigned-off-by: Makoto Ueda \u003cmakoto.ueda.ub@renesas.com\u003e\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "73412c3854c877e5f37ad944ee8977addde4d35a", "tree": "e47e7d021449b6c2d0a9b566cbc8d92f84d466cc", "parents": [ "b65a0e0c84cf489bfa00d6aa6c48abc5a237100f" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Mar 04 09:58:36 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Mar 04 11:07:19 2011 +1000" }, "message": "drm/nouveau: allocate kernel\u0027s notifier object at end of block\n\nThe nv30/nv40 3d driver is about to start using DMA_FENCE from the 3D\nobject which, it turns out, doesn\u0027t like its DMA object to not be\naligned to a 4KiB boundary.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b65a0e0c84cf489bfa00d6aa6c48abc5a237100f", "tree": "3ed9d7b094e003a7b0d98234cb5b490d671bf3a9", "parents": [ "4438a02fc4956f5f61918095708f183f5c63a9d3", "1362fa078dae16776cd439791c6605b224ea6171" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 03 15:48:01 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 03 15:48:01 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:\n DNS: Fix a NULL pointer deref when trying to read an error key [CVE-2011-1076]\n" }, { "commit": "4438a02fc4956f5f61918095708f183f5c63a9d3", "tree": "cc37b89534e3679d8e4e9c95935d040758a9de74", "parents": [ "fb4b10ab5fadcf5012983e4306aec3131b808b1b", "4cd72c6e72e8a36a975decb53d70086008f386db" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 03 15:43:15 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 03 15:43:15 2011 -0800" }, "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: (42 commits)\n MAINTAINERS: Add Andy Gospodarek as co-maintainer.\n r8169: disable ASPM\n RxRPC: Fix v1 keys\n AF_RXRPC: Handle receiving ACKALL packets\n cnic: Fix lost interrupt on bnx2x\n cnic: Prevent status block race conditions with hardware\n net: dcbnl: check correct ops in dcbnl_ieee_set()\n e1000e: disable broken PHY wakeup for ICH10 LOMs, use MAC wakeup instead\n igb: fix sparse warning\n e1000: fix sparse warning\n netfilter: nf_log: avoid oops in (un)bind with invalid nfproto values\n dccp: fix oops on Reset after close\n ipvs: fix dst_lock locking on dest update\n davinci_emac: Add Carrier Link OK check in Davinci RX Handler\n bnx2x: update driver version to 1.62.00-6\n bnx2x: properly calculate lro_mss\n bnx2x: perform statistics \"action\" before state transition.\n bnx2x: properly configure coefficients for MinBW algorithm (NPAR mode).\n bnx2x: Fix ethtool -t link test for MF (non-pmf) devices.\n bnx2x: Fix nvram test for single port devices.\n ...\n" }, { "commit": "fb4b10ab5fadcf5012983e4306aec3131b808b1b", "tree": "35433af7bb28850037c439136830e1c9ad3ce271", "parents": [ "8336026942fdf6a96a45057a2fe6d7f7946979d5", "fd51469fb68b987032e46297e0a4fe9020063c20" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 03 15:42:35 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 03 15:42:35 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block:\n block: kill loop_mutex\n blktrace: Remove blk_fill_rwbs_rq.\n block: blk-flush shouldn\u0027t call directly into q-\u003erequest_fn() __blk_run_queue()\n block: add @force_kblockd to __blk_run_queue()\n block: fix kernel-doc format for blkdev_issue_zeroout\n blk-throttle: Do not use kblockd workqueue for throtl work\n" }, { "commit": "8336026942fdf6a96a45057a2fe6d7f7946979d5", "tree": "b831d361f5865a86ec645dccd87d74922099ac22", "parents": [ "4c7fd114c65830cb052b6f3d0ab5b11626e64d5d", "69102e9b4b61f56a26717659ec2e572a6b18458d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 03 15:37:59 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 03 15:37:59 2011 -0800" }, "message": "Merge branch \u0027i_nlink\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027i_nlink\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:\n hfs: fix rename() over non-empty directory\n udf: fix i_nlink limit\n fix reiserfs mkdir() breakage\n exofs: i_nlink races in rename()\n nilfs2: i_nlink races in rename()\n minix: i_nlink races in rename()\n ufs: i_nlink races in rename()\n sysv: i_nlink races in rename()\n" }, { "commit": "1362fa078dae16776cd439791c6605b224ea6171", "tree": "76738a2137f8dd2e0064d8e74ff4c6e72def2e05", "parents": [ "dd9c1549edef02290edced639f67b54a25abbe0e" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Mar 03 11:28:58 2011 +0000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Mar 04 09:56:19 2011 +1100" }, "message": "DNS: Fix a NULL pointer deref when trying to read an error key [CVE-2011-1076]\n\nWhen a DNS resolver key is instantiated with an error indication, attempts to\nread that key will result in an oops because user_read() is expecting there to\nbe a payload - and there isn\u0027t one [CVE-2011-1076].\n\nGive the DNS resolver key its own read handler that returns the error cached in\nkey-\u003etype_data.x[0] as an error rather than crashing.\n\nAlso make the kenter() at the beginning of dns_resolver_instantiate() limit the\namount of data it prints, since the data is not necessarily NUL-terminated.\n\nThe buggy code was added in:\n\n\tcommit 4a2d789267e00b5a1175ecd2ddefcc78b83fbf09\n\tAuthor: Wang Lei \u003cwang840925@gmail.com\u003e\n\tDate: Wed Aug 11 09:37:58 2010 +0100\n\tSubject: DNS: If the DNS server returns an error, allow that to be cached [ver #2]\n\nThis can trivially be reproduced by any user with the following program\ncompiled with -lkeyutils:\n\n\t#include \u003cstdlib.h\u003e\n\t#include \u003ckeyutils.h\u003e\n\t#include \u003cerr.h\u003e\n\tstatic char payload[] \u003d \"#dnserror\u003d6\";\n\tint main()\n\t{\n\t\tkey_serial_t key;\n\t\tkey \u003d add_key(\"dns_resolver\", \"a\", payload, sizeof(payload),\n\t\t\t KEY_SPEC_SESSION_KEYRING);\n\t\tif (key \u003d\u003d -1)\n\t\t\terr(1, \"add_key\");\n\t\tif (keyctl_read(key, NULL, 0) \u003d\u003d -1)\n\t\t\terr(1, \"read_key\");\n\t\treturn 0;\n\t}\n\nWhat should happen is that keyctl_read() reports error 6 (ENXIO) to the user:\n\n\tdns-break: read_key: No such device or address\n\nbut instead the kernel oopses.\n\nThis cannot be reproduced with the \u0027keyutils add\u0027 or \u0027keyutils padd\u0027 commands\nas both of those cut the data down below the NUL termination that must be\nincluded in the data. Without this dns_resolver_instantiate() will return\n-EINVAL and the key will not be instantiated such that it can be read.\n\nThe oops looks like:\n\nBUG: unable to handle kernel NULL pointer dereference at 0000000000000010\nIP: [\u003cffffffff811b99f7\u003e] user_read+0x4f/0x8f\nPGD 3bdf8067 PUD 385b9067 PMD 0\nOops: 0000 [#1] SMP\nlast sysfs file: /sys/devices/pci0000:00/0000:00:19.0/irq\nCPU 0\nModules linked in:\n\nPid: 2150, comm: dns-break Not tainted 2.6.38-rc7-cachefs+ #468 /DG965RY\nRIP: 0010:[\u003cffffffff811b99f7\u003e] [\u003cffffffff811b99f7\u003e] user_read+0x4f/0x8f\nRSP: 0018:ffff88003bf47f08 EFLAGS: 00010246\nRAX: 0000000000000001 RBX: ffff88003b5ea378 RCX: ffffffff81972368\nRDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff88003b5ea378\nRBP: ffff88003bf47f28 R08: ffff88003be56620 R09: 0000000000000000\nR10: 0000000000000395 R11: 0000000000000002 R12: 0000000000000000\nR13: 0000000000000000 R14: 0000000000000000 R15: ffffffffffffffa1\nFS: 00007feab5751700(0000) GS:ffff88003e000000(0000) knlGS:0000000000000000\nCS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033\nCR2: 0000000000000010 CR3: 000000003de40000 CR4: 00000000000006f0\nDR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\nDR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\nProcess dns-break (pid: 2150, threadinfo ffff88003bf46000, task ffff88003be56090)\nStack:\n ffff88003b5ea378 ffff88003b5ea3a0 0000000000000000 0000000000000000\n ffff88003bf47f68 ffffffff811b708e ffff88003c442bc8 0000000000000000\n 00000000004005a0 00007fffba368060 0000000000000000 0000000000000000\nCall Trace:\n [\u003cffffffff811b708e\u003e] keyctl_read_key+0xac/0xcf\n [\u003cffffffff811b7c07\u003e] sys_keyctl+0x75/0xb6\n [\u003cffffffff81001f7b\u003e] system_call_fastpath+0x16/0x1b\nCode: 75 1f 48 83 7b 28 00 75 18 c6 05 58 2b fb 00 01 be bb 00 00 00 48 c7 c7 76 1c 75 81 e8 13 c2 e9 ff 4c 8b b3 e0 00 00 00 4d 85 ed \u003c41\u003e 0f b7 5e 10 74 2d 4d 85 e4 74 28 e8 98 79 ee ff 49 39 dd 48\nRIP [\u003cffffffff811b99f7\u003e] user_read+0x4f/0x8f\n RSP \u003cffff88003bf47f08\u003e\nCR2: 0000000000000010\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Jeff Layton \u003cjlayton@redhat.com\u003e\ncc: Wang Lei \u003cwang840925@gmail.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "692d20f576fb26f62c83f80dbf3ea899998391b7", "tree": "91b3d1984b2986ea99c2b208de6dc65f1a74c701", "parents": [ "38815b780285a4957852c5c9dbe94991c0b26c56" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Thu Mar 03 12:14:53 2011 -0800" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Thu Mar 03 13:47:40 2011 -0800" }, "message": "libceph: retry after authorization failure\n\nIf we mark the connection CLOSED we will give up trying to reconnect to\nthis server instance. That is appropriate for things like a protocol\nversion mismatch that won\u0027t change until the server is restarted, at which\npoint we\u0027ll get a new addr and reconnect. An authorization failure like\nthis is probably due to the server not properly rotating it\u0027s secret keys,\nhowever, and should be treated as transient so that the normal backoff and\nretry behavior kicks in.\n\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "38815b780285a4957852c5c9dbe94991c0b26c56", "tree": "032d882544ef73d2e99208de7a6e6340df3d31ea", "parents": [ "16a8b70a5a757db513f036bbcc73309f6c507d81" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Wed Mar 02 16:55:21 2011 -0800" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Thu Mar 03 13:47:39 2011 -0800" }, "message": "libceph: fix handling of short returns from get_user_pages\n\nget_user_pages() can return fewer pages than we ask for. We were returning\na bogus pointer/error code in that case. Instead, loop until we get all\nthe pages we want or get an error we can return to the caller.\n\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "4cd72c6e72e8a36a975decb53d70086008f386db", "tree": "81918231e6fcc66e321acbf2848b40e458fa7954", "parents": [ "ba04c7c93bbcb48ce880cf75b6e9dffcd79d4c7b" ], "author": { "name": "Jay Vosburgh", "email": "fubar@us.ibm.com", "time": "Thu Mar 03 10:43:10 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 03 13:29:23 2011 -0800" }, "message": "MAINTAINERS: Add Andy Gospodarek as co-maintainer.\n\nAcked-by: Andy Gospodarek \u003candy@greyhouse.net\u003e\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4c7fd114c65830cb052b6f3d0ab5b11626e64d5d", "tree": "bc6e04138c59caa5661f8ae5f9b833125ae4f26c", "parents": [ "c640e13f8efeb38daa4c0b0891a46d32b01e51ac", "af24ee9ea8d532e16883251a6684dfa1be8eec29" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 03 12:44:22 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 03 12:44:22 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://oss.sgi.com/xfs/xfs\n\n* \u0027for-linus\u0027 of git://oss.sgi.com/xfs/xfs:\n xfs: zero proper structure size for geometry calls\n" }, { "commit": "c640e13f8efeb38daa4c0b0891a46d32b01e51ac", "tree": "e4f5963008d2c8288b4f12cfc812be6dba8f7e5d", "parents": [ "cbdbb4c1d22e26f9d5314fefe6f2c7e5ed7f6a0f", "72746ac643928f6c3113b5aa783d8ea1b13949d2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 03 12:42:48 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 03 12:42:48 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:\n nilfs2: fix regression that i-flag is not set on changeless checkpoints\n" }, { "commit": "ba04c7c93bbcb48ce880cf75b6e9dffcd79d4c7b", "tree": "32accc8c42e605628367efb5bfbf4fbf2fce4f80", "parents": [ "f009918a1c1bbf8607b8aab3959876913a30193a" ], "author": { "name": "Stanislaw Gruszka", "email": "sgruszka@redhat.com", "time": "Tue Feb 22 02:00:11 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 03 11:55:43 2011 -0800" }, "message": "r8169: disable ASPM\n\nFor some time is known that ASPM is causing troubles on r8169, i.e. make\ndevice randomly stop working without any errors in dmesg.\n\nCurrently Tomi Leppikangas reports that system with r8169 device hangs\nwith MCE errors when ASPM is enabled:\nhttps://bugzilla.redhat.com/show_bug.cgi?id\u003d642861#c4\n\nLets disable ASPM for r8169 devices at all, to avoid problems with\nr8169 PCIe devices at least for some users.\n\nReported-by: Tomi Leppikangas \u003ctomi.leppikangas@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "077f8ec889bb1eb26a7128fdbc75922755ed2320", "tree": "196fe4b28dbda6f1036902c50a109fecb990cd76", "parents": [ "525a11381bcad9a7f55d0bac9c8676fe71819002", "b3329a33b5a3902e65c5517f41c374f5adb060e1" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Mar 03 10:25:18 2011 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Mar 03 10:25:18 2011 -0800" }, "message": "Merge branch \u0027for_2.6.38/pm-fixes\u0027 of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-fixes\n" }, { "commit": "525a11381bcad9a7f55d0bac9c8676fe71819002", "tree": "1884d45e72e808b4970d8b05b5a62a139c2dd10d", "parents": [ "dd9c1549edef02290edced639f67b54a25abbe0e" ], "author": { "name": "Hari Kanigeri", "email": "h-kanigeri2@ti.com", "time": "Wed Mar 02 22:14:18 2011 +0000" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Mar 03 10:24:19 2011 -0800" }, "message": "omap: mailbox: resolve hang issue\n\nomap4 interrupt disable bits is different. On rx kfifo full, the mbox rx\ninterrupts wasn\u0027t getting disabled, and this is causing the rcm stress tests\nto hang.\n\nSigned-off-by: Hari Kanigeri \u003ch-kanigeri2@ti.com\u003e\nSigned-off-by: Armando Uribe \u003cx0095078@ti.com\u003e\nSigned-off-by: Fernando Guzman Lugo \u003cfernando.lugo@ti.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "16a8b70a5a757db513f036bbcc73309f6c507d81", "tree": "e075716a8e58149894fcad3fa36ebf6ea16cfc6e", "parents": [ "b545cc1505eb49247071ce9f4092665de788ca00" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Mon Feb 28 12:49:15 2011 -0800" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Thu Mar 03 10:09:52 2011 -0800" }, "message": "ceph: do not clear I_COMPLETE from d_release\n\nFirst, this was racy anyway: d_release isn\u0027t called until well after the\ndentry is unhashed. Second, this runs afoul of the recent dcache change\nthat clears d_parent prior to calling d_release (949854d0), causing a NULL\npointer dereference.\n\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "b545cc1505eb49247071ce9f4092665de788ca00", "tree": "25bfbae54c086a1fdd0801efdd07aa4bdfdac951", "parents": [ "9bde178d052418af0b8e0f12932cf02ab4764c9d" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Mon Feb 28 12:46:46 2011 -0800" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Thu Mar 03 10:09:51 2011 -0800" }, "message": "ceph: do not set I_COMPLETE\n\nDo not set the I_COMPLETE flag on directories until we resolve races with\ndcache pruning.\n\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "9bde178d052418af0b8e0f12932cf02ab4764c9d", "tree": "e70cf12b6687ce93005ca97937e5b79da42e09a1", "parents": [ "f5412be599602124d2bdd49947b231dd77c0bf99" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Mon Feb 28 09:47:37 2011 -0800" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Thu Mar 03 10:09:50 2011 -0800" }, "message": "Revert \"ceph: keep reference to parent inode on ceph_dentry\"\n\nThis reverts commit 97d79b403ef03f729883246208ef5d8a2ebc4d68.\n\nThis fails to account for d_parent changes due to rename or disconnected\ndentries due to submounts or NFS reexports.\n\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "0c2bd9b24e73287aa4ee87844c847205e0da8a9b", "tree": "4e56fae8cb7f8dcbc022771436e573c5c12b94fb", "parents": [ "b652277b09d3d030cb074cc6a98ba80b34244c03" ], "author": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Thu Mar 03 17:56:07 2011 +0100" }, "committer": { "name": "Martin Schwidefsky", "email": "sky@mschwide.boeblingen.de.ibm.com", "time": "Thu Mar 03 17:56:14 2011 +0100" }, "message": "[S390] tape: deadlock on system work queue\n\nThe 34xx and 3590 tape driver uses the system work queue to defer work\nfrom the interrupt function to process context, e.g. a medium sense\nafter an unsolicited interrupt. The tape commands started by the work\nhandler need to be asynchronous, otherwise a deadlock on the system\nwork queue can occur.\n\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "b652277b09d3d030cb074cc6a98ba80b34244c03", "tree": "3e83ec35774580a151fa7e59ec32f7c5786c689c", "parents": [ "0c0db0355bc070b4c623622248d3f577642536b9" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Thu Mar 03 17:56:06 2011 +0100" }, "committer": { "name": "Martin Schwidefsky", "email": "sky@mschwide.boeblingen.de.ibm.com", "time": "Thu Mar 03 17:56:14 2011 +0100" }, "message": "[S390] keyboard: integer underflow bug\n\nThe \"ct\" variable should be an unsigned int. Both struct kbdiacrs\n-\u003ekb_cnt and struct kbd_data -\u003eaccent_table_size are unsigned ints.\n\nMaking it signed causes a problem in KBDIACRUC because the user could\nset the signed bit and cause a buffer overflow.\n\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "0c0db0355bc070b4c623622248d3f577642536b9", "tree": "6bb3a0464d621bae16c5f61ba3920c5c1359a61d", "parents": [ "cbdbb4c1d22e26f9d5314fefe6f2c7e5ed7f6a0f" ], "author": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Thu Mar 03 17:56:05 2011 +0100" }, "committer": { "name": "Martin Schwidefsky", "email": "sky@mschwide.boeblingen.de.ibm.com", "time": "Thu Mar 03 17:56:14 2011 +0100" }, "message": "[S390] xpram: remove __initdata attribute from module parameters\n\nThe module parameter \u0027devs\u0027 and \u0027sizes\u0027 are marked as __initdata. The\nmemory for the parameters are freed after module_init completed. This\ncan lead to kernel crashes in param_free_charp. Remove the __initdata\nattribute to fix the problem.\n\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "fd51469fb68b987032e46297e0a4fe9020063c20", "tree": "a108634afe0a0b2113f5df6ef5c00be2087f51c3", "parents": [ "2d3a8497f8cc5aca14b722cd37d51f6c15ff9f74" ], "author": { "name": "Petr Uzel", "email": "petr.uzel@suse.cz", "time": "Thu Mar 03 11:48:50 2011 -0500" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Mar 03 11:53:25 2011 -0500" }, "message": "block: kill loop_mutex\n\nFollowing steps lead to deadlock in kernel:\n\ndd if\u003d/dev/zero of\u003dimg bs\u003d512 count\u003d1000\nlosetup -f img\nmkfs.ext2 /dev/loop0\nmount -t ext2 -o loop /dev/loop0 mnt\numount mnt/\n\nStacktrace:\n[\u003cc102ec04\u003e] irq_exit+0x36/0x59\n[\u003cc101502c\u003e] smp_apic_timer_interrupt+0x6b/0x75\n[\u003cc127f639\u003e] apic_timer_interrupt+0x31/0x38\n[\u003cc101df88\u003e] mutex_spin_on_owner+0x54/0x5b\n[\u003cfe2250e9\u003e] lo_release+0x12/0x67 [loop]\n[\u003cc10c4eae\u003e] __blkdev_put+0x7c/0x10c\n[\u003cc10a4da5\u003e] fput+0xd5/0x1aa\n[\u003cfe2250cf\u003e] loop_clr_fd+0x1a9/0x1b1 [loop]\n[\u003cfe225110\u003e] lo_release+0x39/0x67 [loop]\n[\u003cc10c4eae\u003e] __blkdev_put+0x7c/0x10c\n[\u003cc10a59d9\u003e] deactivate_locked_super+0x17/0x36\n[\u003cc10b6f37\u003e] sys_umount+0x27e/0x2a5\n[\u003cc10b6f69\u003e] sys_oldumount+0xb/0xe\n[\u003cc1002897\u003e] sysenter_do_call+0x12/0x26\n[\u003cffffffff\u003e] 0xffffffff\n\nRegression since 2a48fc0ab24241755dc9, which introduced the private\nloop_mutex as part of the BKL removal process.\n\nAs per [1], the mutex can be safely removed.\n\n[1] http://www.gossamer-threads.com/lists/linux/kernel/1341930\n\nAddresses: https://bugzilla.novell.com/show_bug.cgi?id\u003d669394\nAddresses: https://bugzilla.kernel.org/show_bug.cgi?id\u003d29172\n\nSigned-off-by: Petr Uzel \u003cpetr.uzel@suse.cz\u003e\nCc: stable@kernel.org\nReviewed-by: Nikanth Karthikesan \u003cknikanth@suse.de\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "2d3a8497f8cc5aca14b722cd37d51f6c15ff9f74", "tree": "2e0013fdc1eec486a425e666a885b04a1c37befb", "parents": [ "255bb490c8c27eed484d538efe6ef6a7473bd3f6" ], "author": { "name": "Tao Ma", "email": "boyu.mt@taobao.com", "time": "Thu Mar 03 10:53:20 2011 -0500" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Mar 03 10:53:20 2011 -0500" }, "message": "blktrace: Remove blk_fill_rwbs_rq.\n\nIf we enable trace events to trace block actions, We use\nblk_fill_rwbs_rq to analyze the corresponding actions\nin request\u0027s cmd_flags, but we only choose the minor 2 bits\nfrom it, so most of other flags(e.g, REQ_SYNC) are missing.\nFor example, with a sync write we get:\nwrite_test-2409 [001] 160.013869: block_rq_insert: 3,64 W 0 () 258135 + \u003d\n8 [write_test]\n\nSince now we have integrated the flags of both bio and request,\nit is safe to pass rq-\u003ecmd_flags directly to blk_fill_rwbs and\nblk_fill_rwbs_rq isn\u0027t needed any more.\n\nWith this patch, after a sync write we get:\nwrite_test-2417 [000] 226.603878: block_rq_insert: 3,64 WS 0 () 258135 +\u003d\n 8 [write_test]\n\nSigned-off-by: Tao Ma \u003cboyu.mt@taobao.com\u003e\nAcked-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "38c07641905c0db58e800ea974cd9158717c6610", "tree": "efa65dffd2e097a2e83546a4a42d71f392fab11d", "parents": [ "c8900a0fad5ae9f4823451de17ba5dec6653ac74" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Mar 03 14:54:19 2011 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Mar 03 15:16:33 2011 +0100" }, "message": "ALSA: hda - Don\u0027t set to D3 in Cirrus errata init verbs\n\nThe errata init verbs for CS42xx codecs contain the verbs to set\nthe power-state of SPDIF nodes to D3, which seem to break the SPDIF\noutput on some MacBooks. Since this is executed during the power-up\ninitialization, we shouldn\u0027t turn them down there.\n\nReported-by: Arun Raghavan \u003carun.raghavan@collabora.co.uk\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "c8900a0fad5ae9f4823451de17ba5dec6653ac74", "tree": "b361eba74ace15bcd1acae38e9a0f52e13385d02", "parents": [ "c790ad31a28671b9b478f5d4db2f8b05dabaae4e" ], "author": { "name": "Richard Samson", "email": "samson.richard@gmail.com", "time": "Thu Mar 03 12:46:13 2011 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Mar 03 12:49:29 2011 +0100" }, "message": "ALSA: hda - add new Fermi 5xx codec IDs to snd-hda\n\nAdded the missing HDMI codec IDs for new Nvidia stuff.\nNote that ID 0x17 isn\u0027t assigned to anything so far, as suggested by\nStephen.\n\n[Modified to get rid of 0x17 by tiwai]\n\nSigned-off-by: Richard Samson \u003csamson.richard@gmail.com\u003e\nAcked-by: Acked-By: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "69102e9b4b61f56a26717659ec2e572a6b18458d", "tree": "85f94fc81091e1f8014c9696359587884dceb3b8", "parents": [ "810c1b2e48d32a8605928c3609262d94853c3a76" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Mar 02 23:46:51 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Mar 03 01:28:40 2011 -0500" }, "message": "hfs: fix rename() over non-empty directory\n\nmerge hfs_unlink() and hfs_rmdir(), while we are at it.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "810c1b2e48d32a8605928c3609262d94853c3a76", "tree": "8b1552e74152d7a2c8d129bd1c2cd30d0a1222bf", "parents": [ "99890a3be1ee67346300f1e0a873006588760f2a" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Mar 02 10:15:26 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Mar 03 01:28:40 2011 -0500" }, "message": "udf: fix i_nlink limit\n\n(256 \u003c\u003c sizeof(x)) - 1 is not the maximal possible value of x...\nIn reality, the maximal allowed value for UDF FileLinkCount is\n65535.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "99890a3be1ee67346300f1e0a873006588760f2a", "tree": "a2d704543672fd5c36c95aee728cddaf2f2c26d5", "parents": [ "babfe56046885749b6a90a3c4409219a1f16cf48" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Mar 02 09:35:13 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Mar 03 01:28:40 2011 -0500" }, "message": "fix reiserfs mkdir() breakage\n\nif directory has so many subdirectories that its link count is set\nto 1 (i.e. \"can\u0027t tell accurately\") and reiserfs_new_inode() fails,\nwe shouldn\u0027t decrement the parent\u0027s link count in cleanup path;\nthat\u0027s what DEC_DIR_INODE_NLINK() is for. As it is, we end up\nwith parent suddenly getting zero i_nlink, with very unpleasant\neffects.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "babfe56046885749b6a90a3c4409219a1f16cf48", "tree": "67c9c4f3a03902a94036e573a3d82fe290eeac4d", "parents": [ "30eb43d31478f0fca28423623f3ec6af13f845fa" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Mar 02 16:42:38 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Mar 03 01:28:17 2011 -0500" }, "message": "exofs: i_nlink races in rename()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "30eb43d31478f0fca28423623f3ec6af13f845fa", "tree": "7bcf4777cd9c4da6c5c1f9f44cb59bed73e9c64b", "parents": [ "6f88049caf56022c773272e03ddfa8cf79867059" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Mar 02 12:01:13 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Mar 03 01:28:17 2011 -0500" }, "message": "nilfs2: i_nlink races in rename()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "6f88049caf56022c773272e03ddfa8cf79867059", "tree": "fa437786f79a0470f3a7e74a441952baa8edfb8e", "parents": [ "37750cdda36721fa7fa816f5f58258d2c013b248" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Mar 02 09:41:38 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Mar 03 01:28:16 2011 -0500" }, "message": "minix: i_nlink races in rename()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "37750cdda36721fa7fa816f5f58258d2c013b248", "tree": "0c8f83e9865dc279f00881e71c442c7dfc198104", "parents": [ "4787d45fa76b97e224a8299086bb5fb496275796" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Mar 02 09:40:21 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Mar 03 01:28:16 2011 -0500" }, "message": "ufs: i_nlink races in rename()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "4787d45fa76b97e224a8299086bb5fb496275796", "tree": "8473ed7fd9d5bc00a8720340d226d7478f4163e6", "parents": [ "cbdbb4c1d22e26f9d5314fefe6f2c7e5ed7f6a0f" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Mar 02 09:38:45 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Mar 03 01:28:16 2011 -0500" }, "message": "sysv: i_nlink races in rename()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "f009918a1c1bbf8607b8aab3959876913a30193a", "tree": "4d2417f7e1dcebd817393291310a00f5d90eab8c", "parents": [ "10003453479ef287a73f8a39593f8f42687ea565" ], "author": { "name": "Anton Blanchard", "email": "anton@au1.ibm.com", "time": "Mon Feb 28 03:27:53 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 02 22:18:53 2011 -0800" }, "message": "RxRPC: Fix v1 keys\n\ncommit 339412841d7 (RxRPC: Allow key payloads to be passed in XDR form)\nbroke klog for me. I notice the v1 key struct had a kif_version field\nadded:\n\n-struct rxkad_key {\n- u16 security_index; /* RxRPC header security index */\n- u16 ticket_len; /* length of ticket[] */\n- u32 expiry; /* time at which expires */\n- u32 kvno; /* key version number */\n- u8 session_key[8]; /* DES session key */\n- u8 ticket[0]; /* the encrypted ticket */\n-};\n\n+struct rxrpc_key_data_v1 {\n+ u32 kif_version; /* 1 */\n+ u16 security_index;\n+ u16 ticket_length;\n+ u32 expiry; /* time_t */\n+ u32 kvno;\n+ u8 session_key[8];\n+ u8 ticket[0];\n+};\n\nHowever the code in rxrpc_instantiate strips it away:\n\n\tdata +\u003d sizeof(kver);\n\tdatalen -\u003d sizeof(kver);\n\nRemoving kif_version fixes my problem.\n\nSigned-off-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "10003453479ef287a73f8a39593f8f42687ea565", "tree": "c66b9be08673889103a60e3a458a850cc5477546", "parents": [ "0197b087ed6384760656f1e4a620a3e92d8dc0b0" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Mon Feb 28 03:27:43 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 02 22:18:52 2011 -0800" }, "message": "AF_RXRPC: Handle receiving ACKALL packets\n\nThe OpenAFS server is now sending ACKALL packets, so we need to handle them.\nOtherwise we report a protocol error and abort.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cbdbb4c1d22e26f9d5314fefe6f2c7e5ed7f6a0f", "tree": "bc5255afdf35de2541afa05a30a83b5d18818820", "parents": [ "f7d222ea2ac7aebf1ac06a76e7739ed17480fd38", "0366ebbf94cfafbdb1fd8c30da47a945294fe1a1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 02 20:02:32 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 02 20:02:32 2011 -0800" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm/i915: fix memory corruption with GM965 and \u003e4GB RAM\n" }, { "commit": "f7d222ea2ac7aebf1ac06a76e7739ed17480fd38", "tree": "a6de80eed5413b32cf41bcb73d108a8f11253c8e", "parents": [ "7a16d387dda10ecc0c4fbf086b89bfb1eb84d9c2", "a74ea43df1afc68f265c0ac2cb64031d855ae97b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 02 20:01:57 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 02 20:01:57 2011 -0800" }, "message": "Merge branch \u0027devicetree/merge\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027devicetree/merge\u0027 of git://git.secretlab.ca/git/linux-2.6:\n of/promtree: allow DT device matching by fixing \u0027name\u0027 brokenness (v5)\n x86: OLPC: have prom_early_alloc BUG rather than return NULL\n of/flattree: Drop an uninteresting message to pr_debug level\n of: Add missing of_address.h to xilinx ehci driver\n" }, { "commit": "7a16d387dda10ecc0c4fbf086b89bfb1eb84d9c2", "tree": "0aa5c47c0e91836c93c54992dc3e66da6cb5f158", "parents": [ "06f9a73ff9ef58a59af593c37020749816735789", "10e53f5834cd3b9a14e1c944a3e7ad34ee368834" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 02 20:01:31 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 02 20:01:31 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:\n alpha: Enable GENERIC_HARDIRQS_NO_DEPRECATED\n alpha: irq: Convert affinity to use irq_data\n alpha: irq: Remove pointless irq status manipulation\n alpha: titan: Convert irq_chip functions\n alpha: takara: Convert irq_chip functions\n alpha: sable: Convert irq_chip functions\n alpha: rx164: Convert irq_chip functions\n alpha: noritake: Convert irq_chip functions\n alpha: rawhide: Convert irq_chip functions\n alpha: mikasa: Convert irq_chip functions\n alpha: marvel: Convert irq_chip functions\n alpha: eiger: Convert irq_chip functions\n alpha: eb64p: Convert irq_chip functions\n alpha: dp264: Convert irq_chip functions\n alpha: cabriolet: Convert irq_chip functions\n alpha: i8259, alcor, jensen wildfire: Convert irq_chip\n alpha: srm: Convert irq_chip functions\n alpha: Pyxis convert irq_chip functions\n Fix typo in call to irq_to_desc()\n" }, { "commit": "06f9a73ff9ef58a59af593c37020749816735789", "tree": "71dc2f9ced5fb58ccd4a2d148b707e1ec5e33c07", "parents": [ "25271d8c84dabd926bbf8727d2f6e90fcbce30b6", "4b57018dcd6418e18c08088c89f123da8a7bfc45" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 02 20:01:07 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 02 20:01:07 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:\n mfd: Avoid tps6586x burst writes\n mfd: Don\u0027t suspend WM8994 if the CODEC is not suspended\n mfd: Fix DaVinci voice codec device name\n mfd: Fix NULL pointer due to non-initialized ucb1x00-ts absinfo\n mfd: Fix ASIC3 build with GENERIC_HARDIRQS_NO_DEPRECATED\n" } ], "next": "25271d8c84dabd926bbf8727d2f6e90fcbce30b6" }