summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonnie Sahlberg <sahlberg@ronnie>2007-08-07 09:03:51 +1000
committerRonnie Sahlberg <sahlberg@ronnie>2007-08-07 09:03:51 +1000
commit5c1a7f19fc4bfd09660f6315803873e6184cf9ca (patch)
tree26598496ecb99c3fe76d240cf9b43334757113eb
parent209f63d42ae1a15f1a41301accffb916894f10ed (diff)
downloadsamba-5c1a7f19fc4bfd09660f6315803873e6184cf9ca.tar.gz
samba-5c1a7f19fc4bfd09660f6315803873e6184cf9ca.tar.xz
samba-5c1a7f19fc4bfd09660f6315803873e6184cf9ca.zip
move scsi/scsi_io.c to utils/scsi/scsi_io.c
(This used to be ctdb commit 157e5a0e96af133d28a36847c82efd23fb2354e3)
-rw-r--r--ctdb/Makefile.in4
-rw-r--r--ctdb/utils/scsi_io/scsi_io.c (renamed from ctdb/scsi/scsi_io.c)0
2 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in
index da3e731b0dc..9622180ce7c 100644
--- a/ctdb/Makefile.in
+++ b/ctdb/Makefile.in
@@ -77,9 +77,9 @@ bin/ctdbd: $(CTDB_SERVER_OBJ)
@echo Linking $@
@$(CC) $(CFLAGS) -o $@ $(CTDB_SERVER_OBJ) $(LIB_FLAGS)
-bin/scsi_io: $(CTDB_CLIENT_OBJ) scsi/scsi_io.o
+bin/scsi_io: $(CTDB_CLIENT_OBJ) utils/scsi_io/scsi_io.o
@echo Linking $@
- @$(CC) $(CFLAGS) -o $@ scsi/scsi_io.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+ @$(CC) $(CFLAGS) -o $@ utils/scsi_io/scsi_io.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb.o
@echo Linking $@
diff --git a/ctdb/scsi/scsi_io.c b/ctdb/utils/scsi_io/scsi_io.c
index a177d726dc7..a177d726dc7 100644
--- a/ctdb/scsi/scsi_io.c
+++ b/ctdb/utils/scsi_io/scsi_io.c