summaryrefslogtreecommitdiff
path: root/.bashrc
diff options
context:
space:
mode:
Diffstat (limited to '.bashrc')
-rw-r--r--.bashrc4
1 files changed, 2 insertions, 2 deletions
diff --git a/.bashrc b/.bashrc
index 1a2e8ce..6bdf55a 100644
--- a/.bashrc
+++ b/.bashrc
@@ -3,8 +3,8 @@
parent=$(ps -o comm= -p $PPID)
# use zsh if available and configured
-if [ -f /bin/zsh ] && [ -f .zsh/override_bash ] && [ "x$parent" != "xzsh" ] && [ "x$parent" != "bash" ] ; then
- exec /bin/zsh
+if [ -x /bin/zsh ] && [ -f .zsh/override_bash ] && [ "x$parent" != "xzsh" ] && [ "x$parent" != "bash" ] ; then
+ exec /bin/zsh
fi
# If not running interactively, don't do anything
c55a8782a6920f044d9bf6207a&id2=c14024dbb156c8392908aaa822097d27c6af8ec8'>diff)
block: don't try Write Same from __blkdev_issue_zeroout
Write Same can return an error asynchronously if it turns out the underlying SCSI device does not support Write Same, which makes a proper fallback to other methods in __blkdev_issue_zeroout impossible. Thus only issue a Write Same from blkdev_issue_zeroout an don't try it at all from __blkdev_issue_zeroout as a non-invasive workaround. Signed-off-by: Christoph Hellwig <hch@lst.de> Reported-by: Junichi Nomura <j-nomura@ce.jp.nec.com> Fixes: e73c23ff ("block: add async variant of blkdev_issue_zeroout") Tested-by: Junichi Nomura <j-nomura@ce.jp.nec.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'net/netlabel/netlabel_user.c')