summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'misc' of ↵Linus Torvalds2011-05-254-10/+28
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: export_report: use warn() to issue WARNING, so they go to stderr export_report: sort SECTION 2 output export_report: do collectcfiles work in perl itself kbuild: make versioncheck work in KBUILD_OUTDIR kbuild: make includecheck work in KBUILD_OUTDIR kbuild: make headerdep work in KBUILD_OUTDIR kbuild: add targets to PHONY kbuild: don't warn about include/linux/version.h not including itself eradicate bashisms in scripts/patch-kernel
| * export_report: use warn() to issue WARNING, so they go to stderrJim Cromie2011-05-241-1/+7
| | | | | | | | | | | | | | | | | | | | Also count CONFIG_MODVERSIONS warnings, and print a NOTE at start of SECTION 2 if any were issued. Section 2 will be empty if the build is lacking this CONFIG_ item, and user may have missed the warnings, as they're off screen. Signed-off-by: Jim Cromie <jim.cromie@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
| * export_report: sort SECTION 2 outputJim Cromie2011-05-241-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Sort SECTION 2 modules by name. Within those module listings, sort the symbol providers by name, and remove the count, as it is misleading; its the kernel-wide count of uses of that symbol, not the count pertaining to the module being outlined. (this can be seen by grepping the output for a single symbol). The count is still used to sort the symbols. Signed-off-by: Jim Cromie <jim.cromie@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
| * export_report: do collectcfiles work in perl itselfJim Cromie2011-05-241-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid spawning a shell pipeline doing cat, grep, sed, and do it all inside perl. The <*.c> globbing construct works at least as far back as 5.8.9 Note that this is not just an optimization; the sed command in the pipeline was unterminated, due to lack of escape on the end-of-line (\$) in the regex, resulting in this: $ perl ../linux-2.6/scripts/export_report.pl > /dev/null sed: -e expression #1, char 5: unterminated `s' command sh: .mod.c/: not found Comments on an earlier patch sought an all-perl implementation. Signed-off-by: Jim Cromie <jim.cromie@gmail.com> cc: Michal Marek <mmarek@suse.cz>, cc: linux-kbuild@vger.kernel.org cc: Arnaud Lacombe lacombar@gmail.com cc: Stephen Hemminger shemminger@vyatta.com Signed-off-by: Michal Marek <mmarek@suse.cz>
| * kbuild: make versioncheck work in KBUILD_OUTDIRPeter Foley2011-05-121-1/+1
| | | | | | | | | | | | | | | | This patch fixes the versioncheck target so it works when make is invoked in KBUILD_OUTDIR. Signed-off-by: Peter Foley <pefoley2@verizon.net> Signed-off-by: Michal Marek <mmarek@suse.cz>
| * kbuild: make includecheck work in KBUILD_OUTDIRPeter Foley2011-05-121-1/+1
| | | | | | | | | | | | | | | | This patch fixes the includecheck target so it works when make is invoked in KBUILD_OUTDIR. Signed-off-by: Peter Foley <pefoley2@verizon.net> Signed-off-by: Michal Marek <mmarek@suse.cz>
| * kbuild: make headerdep work in KBUILD_OUTDIRPeter Foley2011-05-121-1/+2
| | | | | | | | | | | | | | | | This patch fixes the headerdep target so it works when make is invoked in KBUILD_OUTDIR. Signed-off-by: Peter Foley <pefoley2@verizon.net> Signed-off-by: Michal Marek <mmarek@suse.cz>
| * kbuild: add targets to PHONYPeter Foley2011-05-121-0/+2
| | | | | | | | | | | | | | | | This patch adds some targets to PHONY so they are built even if a file with the same name exists. Signed-off-by: Peter Foley <pefoley2@verizon.net> Signed-off-by: Michal Marek <mmarek@suse.cz>
| * kbuild: don't warn about include/linux/version.h not including itselfPeter Foley2011-04-291-0/+1
| | | | | | | | | | | | | | | | | | This patch makes checkversion.pl not warn that include/linux/version.h dosen't include itself. Signed-off-by: Peter Foley <pefoley2@verizon.net> [mmarek: simplified to use 'next if' syntax] Signed-off-by: Michal Marek <mmarek@suse.cz>
| * eradicate bashisms in scripts/patch-kernelAndreas Mohr2011-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Silence a remaining annoying (or worse, irritating - "is my entire patched tree broken now!?") bashism-related message that occurs when /bin/sh is configured to instead deploy dash, a POSIX-compliant shell, as is the pretty much standard case on e.g. Debian. Current kernel version is 2.6.38 ( Flesh-Eating Bats with Fangs) ===> linux-2.6.38.patch-kernel_test/scripts/patch-kernel: line 253: [: =: unary operator expected <=== cannot find patch file: patch-2.6.39 Signed-off-by: Andreas Mohr <andi@lisas.de> Signed-off-by: Michal Marek <mmarek@suse.cz>
* | Merge branch 'packaging' of ↵Linus Torvalds2011-05-252-3/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 * 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: kbuild: Create a kernel-headers RPM rpm-pkg: Fix when current directory is a symlink Replace '-' in kernel version with '_'
| * | kbuild: Create a kernel-headers RPMArun Sharma2011-05-241-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | To compile binaries which depend on new kernel interfaces, we need a kernel-headers RPM Signed-off-by: Arun Sharma <asharma@fb.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
| * | rpm-pkg: Fix when current directory is a symlinkMichal Marek2011-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | The better fix would be to stop using the parent directory (principle of least surprise), but as long as we use it, use it consistently. Signed-off-by: Michal Marek <mmarek@suse.cz>
| * | Replace '-' in kernel version with '_'Arun Sharma2011-05-042-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | Removing the '-' results in hard to read filenames such as: kernel-2.6.35.2000042g76e4caf-28.x86_64.rpm kernel-2.6.35.2_000042_g76e4caf-28.x86_64.rpm is easier to read. Signed-off-by: Arun Sharma <asharma@fb.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
* | Merge branch 'for-linus' of ↵Linus Torvalds2011-05-2511-75/+173
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (23 commits) ceph: fix cap flush race reentrancy libceph: subscribe to osdmap when cluster is full libceph: handle new osdmap down/state change encoding rbd: handle online resize of underlying rbd image ceph: avoid inode lookup on nfs fh reconnect ceph: use LOOKUPINO to make unconnected nfs fh more reliable rbd: use snprintf for disk->disk_name rbd: cleanup: make kfree match kmalloc rbd: warn on update_snaps failure on notify ceph: check return value for start_request in writepages ceph: remove useless check libceph: add missing breaks in addr_set_port libceph: fix TAG_WAIT case ceph: fix broken comparison in readdir loop libceph: fix osdmap timestamp assignment ceph: fix rare potential cap leak libceph: use snprintf for unknown addrs libceph: use snprintf for formatting object name ceph: use snprintf for dirstat content libceph: fix uninitialized value when no get_authorizer method is set ...
| * | ceph: fix cap flush race reentrancySage Weil2011-05-243-29/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In e9964c10 we change cap flushing to do a delicate dance because some inodes on the cap_dirty list could be in a migrating state (got EXPORT but not IMPORT) in which we couldn't actually flush and move from dirty->flushing, breaking the while (!empty) { process first } loop structure. It worked for a single sync thread, but was not reentrant and triggered infinite loops when multiple syncers came along. Instead, move inodes with dirty to a separate cap_dirty_migrating list when in the limbo export-but-no-import state, allowing us to go back to the simple loop structure (which was reentrant). This is cleaner and more robust. Audited the cap_dirty users and this looks fine: list_empty(&ci->i_dirty_item) is still a reliable indicator of whether we have dirty caps (which list we're on is irrelevant) and list_del_init() calls still do the right thing. Signed-off-by: Sage Weil <sage@newdream.net>
| * | libceph: subscribe to osdmap when cluster is fullSage Weil2011-05-241-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | When the cluster is marked full, subscribe to subsequent map updates to ensure we find out promptly when it is no longer full. This will prevent us from spewing ENOSPC for (much) longer than necessary. Signed-off-by: Sage Weil <sage@newdream.net>
| * | libceph: handle new osdmap down/state change encodingSage Weil2011-05-241-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | Old incrementals encode a 0 value (nearly always) when an osd goes down. Change that to allow any state bit(s) to be flipped. Special case 0 to mean flip the CEPH_OSD_UP bit to mimic the old behavior. Signed-off-by: Sage Weil <sage@newdream.net>
| * | rbd: handle online resize of underlying rbd imageSage Weil2011-05-241-0/+3
| | | | | | | | | | | | | | | | | | | | | If we get a notification that the image header has changed, check for a change in the image size. Signed-off-by: Sage Weil <sage@newdream.net>
| * | ceph: avoid inode lookup on nfs fh reconnectSage Weil2011-05-241-2/+6
| | | | | | | | | | | | | | | | | | | | | If we get the inode from the MDS, we have a reference in req; don't do a fresh lookup. Signed-off-by: Sage Weil <sage@newdream.net>
| * | ceph: use LOOKUPINO to make unconnected nfs fh more reliableSage Weil2011-05-242-2/+18
| | | | | | | | | | | | | | | | | | | | | If we are unable to locate an inode by ino, ask the MDS using the new LOOKUPINO command. Signed-off-by: Sage Weil <sage@newdream.net>
| * | rbd: use snprintf for disk->disk_nameSage Weil2011-05-241-1/+2
| | | | | | | | | | | | Signed-off-by: Sage Weil <sage@newdream.net>
| * | rbd: cleanup: make kfree match kmallocSage Weil2011-05-241-7/+7
| | | | | | | | | | | | Signed-off-by: Sage Weil <sage@newdream.net>
| * | rbd: warn on update_snaps failure on notifySage Weil2011-05-191-1/+6
| | | | | | | | | | | | Signed-off-by: Sage Weil <sage@newdream.net>
| * | ceph: check return value for start_request in writepagesSage Weil2011-05-192-2/+9
| | | | | | | | | | | | | | | | | | | | | Since we pass the nofail arg, we should never get an error; BUG if we do. (And fix the function to not return an error if __map_request fails.) Signed-off-by: Sage Weil <sage@newdream.net>
| * | ceph: remove useless checkSage Weil2011-05-191-2/+0
| | | | | | | | | | | | | | | | | | rc is only ever 0 or negative in this method. Signed-off-by: Sage Weil <sage@newdream.net>
| * | libceph: add missing breaks in addr_set_portSage Weil2011-05-191-0/+2
| | | | | | | | | | | | Signed-off-by: Sage Weil <sage@newdream.net>
| * | libceph: fix TAG_WAIT caseSage Weil2011-05-191-1/+3
| | | | | | | | | | | | | | | | | | | | | If we get a WAIT as a client something went wrong; error out. And don't fall through to an unrelated case. Signed-off-by: Sage Weil <sage@newdream.net>
| * | ceph: fix broken comparison in readdir loopSage Weil2011-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | Both off and fi->offset are unsigned, so the difference is always >= 0. Compare them directly instead of the sign of the difference. Signed-off-by: Sage Weil <sage@newdream.net>
| * | libceph: fix osdmap timestamp assignmentSage Weil2011-05-191-1/+1
| | | | | | | | | | | | Signed-off-by: Sage Weil <sage@newdream.net>
| * | ceph: fix rare potential cap leakSage Weil2011-05-191-1/+2
| | | | | | | | | | | | | | | | | | | | | If we grab new_cap, retake the lock, and find we already have a cap now for the given mds, release new_cap. Signed-off-by: Sage Weil <sage@newdream.net>
| * | libceph: use snprintf for unknown addrsSage Weil2011-05-191-1/+2
| | | | | | | | | | | | Signed-off-by: Sage Weil <sage@newdream.net>
| * | libceph: use snprintf for formatting object nameSage Weil2011-05-191-1/+1
| | | | | | | | | | | | Signed-off-by: Sage Weil <sage@newdream.net>
| * | ceph: use snprintf for dirstat contentSage Weil2011-05-191-2/+3
| | | | | | | | | | | | | | | | | | | | | We allocate a buffer for rstats if the dirstat option is enabled. Use snprintf. Signed-off-by: Sage Weil <sage@newdream.net>
| * | libceph: fix uninitialized value when no get_authorizer method is setSage Weil2011-05-191-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | If there is no get_authorizer method we set the out_kvec to a bogus pointer. The length is also zero in that case, so it doesn't much matter, but it's better not to add the empty item in the first place. Signed-off-by: Sage Weil <sage@newdream.net>
| * | libceph: remove unused variableSage Weil2011-05-191-2/+0
| | | | | | | | | | | | Signed-off-by: Sage Weil <sage@newdream.net>
| * | libceph: handle connection reopen race with callbacksSage Weil2011-05-191-13/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a connection is closed and/or reopened (ceph_con_close, ceph_con_open) it can race with a callback. con_work does various state checks for closed or reopened sockets at the beginning, but drops con->mutex before making callbacks. We need to check for state bit changes after retaking the lock to ensure we restart con_work and execute those CLOSED/OPENING tests or else we may end up operating under stale assumptions. In Jim's case, this was causing 'bad tag' errors. There are four cases where we re-take the con->mutex inside con_work: catch them all and return EAGAIN from try_{read,write} so that we can restart con_work. Reported-by: Jim Schutt <jaschut@sandia.gov> Tested-by: Jim Schutt <jaschut@sandia.gov> Signed-off-by: Sage Weil <sage@newdream.net>
| * | ceph: take reference on mds request r_unsafe_dirSage Weil2011-05-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We put ourselves on an inode list for the parent directory of metadata operations so that an fsync on the directory will wait for metadata updates to commit to disk. We weren't holding a reference to that directory, however, and under certain workloads (fsstress in this case) the directory can go away. Signed-off-by: Sage Weil <sage@newdream.net>
* | | Merge branch 'for-linus' of ↵Linus Torvalds2011-05-2511-59/+55
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: 9p: update Documentation pointers net/9p: enable 9p to work in non-default network namespace net/9p: p9_idpool_get return -1 on error fs/9p: Don't clunk dentry fid when we fail to get a writeback inode 9p: Small cleanup in <net/9p/9p.h> 9p: remove experimental tag from tested configurations 9p: typo fixes and minor cleanups net/9p: Change linuxdoc names to match functions.
| * | | 9p: update Documentation pointersEric Van Hensbergen2011-05-251-19/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update documentation pointers to include virtfs publication, 9p RFC as well as updated list of servers and alternative clients. Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
| * | | net/9p: enable 9p to work in non-default network namespaceRob Landley2011-05-251-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach 9p filesystem to work in container with non-default network namespace. (Note: I also patched the unix domain socket code but don't have a test case for that. It's the same fix, I just don't have a server for it...) To test, run diod server (http://code.google.com/p/diod): diod -n -f -L stderr -l 172.23.255.1:9999 -c /dev/null -e /root and then mount like so: mount -t 9p -o port=9999,aname=/root,version=9p2000.L 172.23.255.1 /mnt A container test environment is described at http://landley.net/lxc Signed-off-by: Rob Landley <rob@landley.net> Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
| * | | net/9p: p9_idpool_get return -1 on errorAneesh Kumar K.V2011-05-252-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to return -1 on error. Also handle error properly Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
| * | | fs/9p: Don't clunk dentry fid when we fail to get a writeback inodeAneesh Kumar K.V2011-05-251-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The dentry fid get clunked via the dput. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
| * | | 9p: Small cleanup in <net/9p/9p.h>Sasha Levin2011-05-251-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two small cleanups in this patch: - p9_errstr2errno was declared twice - remove one declaration. - A uint8_t type was mixed in, change it to u8 to match with the rest of the type names and remove dependency. Cc: Eric Van Hensbergen <ericvh@gmail.com> Cc: Ron Minnich <rminnich@sandia.gov> Cc: Latchesar Ionkov <lucho@ionkov.net> Cc: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Sasha Levin <levinsasha928@gmail.com> Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
| * | | 9p: remove experimental tag from tested configurationsEric Van Hensbergen2011-05-252-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 9p client is currently undergoing regular regresssion and stress testing as a by-product of the virtfs work. I think its finally time to take off the experimental tags from the well-tested code paths. Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
| * | | 9p: typo fixes and minor cleanupsRob Landley2011-05-254-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Typo fixes and minor cleanups for v9fs Signed-off-by: Rob Landley <rob@landley.net> Reviewed-by: Venkateswararao Jujjuri (JV) <jvrao@linux.vnet.ibm.com> Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
| * | | net/9p: Change linuxdoc names to match functions.Rob Landley2011-05-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As on Jeopardy, my question is in the form of a patch: Does this have some special meaning, or is it an accident? (I looked at other filesystems but they didn't bother having doc entries for their init/exit function that I could find.) Signed-off-by: Rob Landley <rob@landley.net> Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
* | | | Merge branch 'for-2.6.40/splice' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2011-05-251-18/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * 'for-2.6.40/splice' of git://git.kernel.dk/linux-2.6-block: splice: add wakeup_pipe_readers()
| * | | | splice: add wakeup_pipe_readers()Namhyung Kim2011-05-231-18/+15
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Add and use wakeup_pipe_readers() to consolidate duplicated codes. Signed-off-by: Namhyung Kim <namhyung@gmail.com> Cc: Jens Axboe <axboe@kernel.dk> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
* | | | Merge branch 'for-2.6.40/drivers' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2011-05-2527-307/+2677
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-2.6.40/drivers' of git://git.kernel.dk/linux-2.6-block: (110 commits) loop: handle on-demand devices correctly loop: limit 'max_part' module param to DISK_MAX_PARTS drbd: fix warning drbd: fix warning drbd: Fix spelling drbd: fix schedule in atomic drbd: Take a more conservative approach when deciding max_bio_size drbd: Fixed state transitions after async outdate-peer-handler returned drbd: Disallow the peer_disk_state to be D_OUTDATED while connected drbd: Fix for the connection problems on high latency links drbd: fix potential activity log refcount imbalance in error path drbd: Only downgrade the disk state in case of disk failures drbd: fix disconnect/reconnect loop, if ping-timeout == ping-int drbd: fix potential distributed deadlock lru_cache.h: fix comments referring to ts_ instead of lc_ drbd: Fix for application IO with the on-io-error=pass-on policy xen/p2m: Add EXPORT_SYMBOL_GPL to the M2P override functions. xen/p2m/m2p/gnttab: Support GNTMAP_host_map in the M2P override. xen/blkback: don't fail empty barrier requests xen/blkback: fix xenbus_transaction_start() hang caused by double xenbus_transaction_end() ...
OpenPOWER on IntegriCloud