tv.tv_sec, tv.tv_usec, stack, current->pid);
max_nob -= prefix_nob;
+ if(*(format + strlen(format) - 1) != '\n')
+ printk(KERN_INFO "format at %s:%d:%s doesn't end in newline\n",
+ file, line, fn);
+
#if defined(__arch_um__) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20))
msg_nob = snprintf(debug_buf + debug_off + prefix_nob, max_nob,
"%d:(%s:%d:%s()) ",
- conf-sanity test_5, proper cleanup in umount log not availale (2640)
- recovery timer race (2670)
- mdc_close recovey bug (2532)
+ - don't try to handle a message that hasn't been replied to (2699)
+ - don't fail assertion if in recovery during cleanup (2701)
+ - fix lconf error (2694)
+ * miscellania
+ - return LL_SUPER_MAGIC from statfs for the filesystem type (1972)
2004-02-07 Cluster File Systems, Inc. <info@clusterfs.com>
* version 1.0.4
/* We cancel locks at disconnect time, but this will catch any locks
* granted in a race with recovery-induced disconnect. */
- ldlm_cancel_locks_for_export(exp);
+ if (exp->exp_obd->obd_namespace != NULL)
+ ldlm_cancel_locks_for_export(exp);
}
/*
RETURN(rc);
}
+ osfs->os_type = sb->s_magic;
+
CDEBUG(D_SUPER, "MDC blocks "LPU64"/"LPU64" objects "LPU64"/"LPU64"\n",
osfs->os_bavail, osfs->os_blocks, osfs->os_ffree,osfs->os_files);
CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p)\n", inode->i_ino,
inode->i_generation, inode);
- /* object not yet allocated - this is handled in ll_setattr_raw */
if (!lsm) {
- CERROR("truncate on inode %lu with no objects\n", inode->i_ino);
+ CDEBUG(D_INODE, "truncate on inode %lu with no objects\n",
+ inode->i_ino);
EXIT;
return;
}
ENTRY;
while ((loi = osc_next_loi(cli)) != NULL) {
-
- LOI_DEBUG(loi, "%d in flight", cli->cl_brw_in_flight);
+ LOI_DEBUG(loi, "%d in flight\n", cli->cl_brw_in_flight);
if (cli->cl_brw_in_flight >= cli->cl_max_rpcs_in_flight)
break;
tv.tv_sec, tv.tv_usec, stack, current->pid);
max_nob -= prefix_nob;
+ if(*(format + strlen(format) - 1) != '\n')
+ printk(KERN_INFO "format at %s:%d:%s doesn't end in newline\n",
+ file, line, fn);
+
#if defined(__arch_um__) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20))
msg_nob = snprintf(debug_buf + debug_off + prefix_nob, max_nob,
"%d:(%s:%d:%s()) ",
imp->imp_connection->c_remote_uuid.uuid);
ptlrpc_set_import_active(imp, 1);
- ptlrpc_resend(imp);
+ rc = ptlrpc_resend(imp);
+ if (rc)
+ GOTO(out, rc);
IMPORT_SET_STATE(imp, LUSTRE_IMP_FULL);
}
ENTRY;
if (list_empty(&ctxt->loc_handle->u.chd.chd_head)) {
- CDEBUG(D_HA, "there is no record related to ctxt %p", ctxt);
+ CDEBUG(D_HA, "there is no record related to ctxt %p\n", ctxt);
RETURN(0);
}
/* Well... what if lctl recover is called twice at the same time?
*/
spin_lock_irqsave(&imp->imp_lock, flags);
- LASSERT(imp->imp_state == LUSTRE_IMP_RECOVER);
+ if (imp->imp_state != LUSTRE_IMP_RECOVER) {
+ spin_unlock_irqrestore(&imp->imp_lock, flags);
+ RETURN(-1);
+ }
spin_unlock_irqrestore(&imp->imp_lock, flags);
list_for_each_safe(tmp, pos, &imp->imp_sending_list) {
+++ /dev/null
-#!/usr/bin/env perl
-
-my $mode = "NONE";
-my @modified, @added, @removed;
-
-while($line = <>) {
- if ($line =~ /Modified Files:/) {
- $mode = "MODIFIED";
- next;
- }
-
- if ($line =~ /Added Files:/) {
- $mode = "ADDED";
- next;
- }
-
- if ($line =~ /Removed Files:/) {
- $mode = "REMOVED";
- next;
- }
-
- if ($mode eq "NONE") { next; }
- if ($line =~ /-------/) { next; }
-
- chop($line);
- $line =~ s/^CVS:\s+//;
- $line =~ s/\s+$//;
- # print "processing $line for $mode\n";
- @files = split(/ /, $line);
- # print "new files for $mode: ", join(', ', @files), "\n";
-
- if ($mode eq "MODIFIED") {
- push(@modified, @files);
- } elsif ($mode eq "ADDED") {
- push(@added, @files);
- } elsif ($mode eq "REMOVED") {
- push(@removed, @files);
- } else {
- die "Unknown mode $mode!";
- }
-}
-
-print join(' ', @modified);
-if ($ENV{"SHOW_ALL_FILES"} ne "no") {
- print ' ', join(' ', @added), ' ', join(' ', @removed);
-}
-print "\n";
+++ /dev/null
-#!/bin/bash
-
-[ -f .mergeinfo ] && . ./.mergeinfo
-
-FILES=`cvs-modified-files.pl $1`
-TMP=`mktemp /tmp/cvslog-XXXXXXXX`
-if [ -f $TMP ]; then
- [ -f .mergeinfo ] && \
- echo "CVS: Update $child from $parent ($date)" >> $TMP
- echo "CVS: did you update the ChangeLog for a bug fix?" >> $TMP
- echo "CVS: b=" >> $TMP
- echo "CVS: r=" >> $TMP
-
- cat $1 >> $TMP
- cp $TMP $1
- rm $TMP
-fi
-
-if [ "${FILES:+have_files}"x = have_filesx ]; then
- echo Diffing $1 : $FILES
- cvs diff -wbBup $FILES 2>/dev/null | sed "s/^/CVS: /" >>$1
-fi
-#gnuclient $1 || vi $1
-[ "$EDITOR" ] || EDITOR=vi
-
-$EDITOR $1
+++ /dev/null
-#!/bin/sh -e
-
-CONFLICTS=cvs-merge-conflicts
-CVS=cvs
-
-if [ -f .mergeinfo ] ; then
- echo ".mergeinfo exists - clean up first"
- exit
-fi
-
-if [ -f $CONFLICTS ] ; then
- echo "$CONFLICTS exists - clean up first"
- exit
-fi
-
-if [ $# -lt 2 -o $# -gt 3 ]; then
- echo "This is phase 1 of merging branches. Usage: $0 parent child [dir]"
- exit
-fi
-
-parent=$1
-PARENT=`echo $parent | sed -e "s/^b_//" | tr "[a-z]" "[A-Z]"`
-child=$2
-CHILD=`echo $child | sed -e "s/^b_//" | tr "[a-z]" "[A-Z]"`
-date=`date +%Y%m%d_%H%M`
-module=lustre
-
-if [ "$parent" != "HEAD" -a "`cat CVS/Tag`" != "T$parent" ]; then
- echo "This script must be run within the $parent branch"
- exit 1
-fi
-
-dir=$3
-
-if [ $parent != "HEAD" ]; then
- parent="b_$parent"
-fi
-if [ $child != "HEAD" ]; then
- child="b_$child"
-fi
-
-cat << EOF > .mergeinfo
-parent=$parent
-PARENT=$PARENT
-child=$child
-CHILD=$CHILD
-date=$date
-module=$module
-dir=$dir
-CONFLICTS=$CONFLICTS
-EOF
-
-echo PARENT $PARENT parent $parent CHILD $CHILD child $child date $date
-
-# Update your tree to the PARENT branch; HEAD is not really a branch, so you
-# need to update -A instead of update -r HEAD, or the commit will fail. -p
-echo -n "Updating to $parent ...."
-if [ $parent == "HEAD" ]; then
- $CVS update -AdP $dir
-else
- $CVS update -r $parent -dP $dir
-fi
-echo "done"
-
-echo -n "Tagging as ${PARENT}_${CHILD}_LAND_PARENT_$date ..."
-$CVS tag ${PARENT}_${CHILD}_LAND_PARENT_$date $dir
-echo "done"
-
-echo -n "Create land point on ${child} ${PARENT}_${CHILD}_LAND_CHILD_$date ..."
-$CVS rtag -r ${child} ${PARENT}_${CHILD}_LAND_CHILD_$date $module $dir
-echo "done"
-
-echo -n "Preserve old base tag ${CHILD}_BASE as ${CHILD}_BASE_PREV ..."
-$CVS tag -F -r ${CHILD}_BASE ${CHILD}_BASE_PREV $dir
-echo "done"
-
-# Apply all of the changes to your local tree:
-echo -n "Updating as -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_LAND_CHILD_$date ..."
-$CVS update -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_LAND_CHILD_$date $dir
-echo "done"
-
-echo -n "Recording conflicts in $CONFLICTS ..."
-if $CVS update | grep '^C' > $CONFLICTS; then
- echo "Conflicts found, fix before committing."
- cat $CONFLICTS
-else
- echo "No conflicts found"
- rm -f $CONFLICTS
-fi
-echo "done"
-
-echo "Test, commit and then run land2.sh (no arguments)"
-
+++ /dev/null
-#!/bin/sh -e
-
-CVS=cvs
-
-if [ ! -f .mergeinfo ] ; then
- echo ".mergeinfo doesn't exist - exit"
- exit
-fi
-
-. .mergeinfo
-
-if [ -f $CONFLICTS ] ; then
- echo "$CONFLICTS exists - clean up first"
- cat $CONFLICTS
- exit
-fi
-
-cvs update $dir 2>&1 | grep "^M" && echo "uncommitted changes" && exit 1
-
-echo -n "Tagging as ${CHILD}_BASE_$date ..."
-$CVS tag -F ${CHILD}_BASE_$date $dir
-echo "done"
-echo -n "Tagging as ${CHILD}_BASE ..."
-$CVS tag -F ${CHILD}_BASE $dir
-
-echo "saving .mergeinfo as .mergeinfo-$date"
-mv .mergeinfo .mergeinfo-$date
-echo "done"
chmod 755 $DIR1
$CHECKSTAT -t dir -p 0755 $DIR2 || error
}
-run_test 2c "check cached attribute updates on 2 mtpt's root ==="
+run_test 2d "check cached attribute updates on 2 mtpt's root ==="
test_3() {
( cd $DIR1 ; ln -s this/is/good lnk )
self.active = 1
else:
self.active = 0
- if self.active and config.group and config.group != ost.get_val('group'):
+ if self.active and config.group and config.group != mds.get_val('group'):
self.active = 0
self.inode_size = self.db.get_val_int('inodesize', 0)
git://git.whamcloud.com / fs / lustre-release.git / commitdiff