Patches from Debian

[nbd.git] / nbd-server.c

diff --git a/nbd-server.c b/nbd-server.c
index 4ac6d1f..4d01e37 100644 (file)
--- a/nbd-server.c
+++ b/nbd-server.c
@@ -149,6 +149,7 @@ gchar* rungroup=NULL;
 #define F_AUTOREADONLY 8  /**< flag to tell us a file is set to autoreadonly */
 #define F_SPARSE 16      /**< flag to tell us copyronwrite should use a sparse file */
 #define F_SDP 32         /**< flag to tell us the export should be done using the Socket Direct Protocol for RDMA */
+#define F_SYNC 64        /**< Whether to fsync() after a write */
 GHashTable *children;
 char pidfname[256]; /**< name of our PID file */
 char pidftemplate[256]; /**< template to be used for the filename of the PID file */
@@ -302,10 +303,14 @@ inline void readit(int f, void *buf, size_t len) {
        ssize_t res;
        while (len > 0) {
                DEBUG("*");
-               if ((res = read(f, buf, len)) <= 0)
-                       err("Read failed: %m");
-               len -= res;
-               buf += res;
+               if ((res = read(f, buf, len)) <= 0) {
+                       if(errno != EAGAIN) {
+                               err("Read failed: %m");
+                       }
+               } else {
+                       len -= res;
+                       buf += res;
+               }
        }
 }
 
@@ -550,6 +555,7 @@ GArray* parse_cfile(gchar* f, GError** e) {
                { "copyonwrite", FALSE, PARAM_BOOL,     NULL, F_COPYONWRITE },
                { "sparse_cow", FALSE,  PARAM_BOOL,     NULL, F_SPARSE },
                { "sdp",        FALSE,  PARAM_BOOL,     NULL, F_SDP },
+               { "sync",       FALSE,  PARAM_BOOL,     NULL, F_SYNC },
                { "listenaddr", FALSE,  PARAM_STRING,   NULL, 0 },
        };
        const int lp_size=sizeof(lp)/sizeof(PARAM);
@@ -575,7 +581,7 @@ GArray* parse_cfile(gchar* f, GError** e) {
        retval = g_array_new(FALSE, TRUE, sizeof(SERVER));
        if(!g_key_file_load_from_file(cfile, f, G_KEY_FILE_KEEP_COMMENTS |
                        G_KEY_FILE_KEEP_TRANSLATIONS, &err)) {
-               g_set_error(e, errdomain, CFILE_NOTFOUND, "Could not open config file.");
+               g_set_error(e, errdomain, CFILE_NOTFOUND, "Could not open config file.", f);
                g_key_file_free(cfile);
                return retval;
        }
@@ -596,8 +602,9 @@ GArray* parse_cfile(gchar* f, GError** e) {
                lp[5].target=&(s.prerun);
                lp[6].target=&(s.postrun);
                lp[7].target=lp[8].target=lp[9].target=
-                               lp[10].target=lp[11].target=&(s.flags);
-               lp[12].target=&(s.listenaddr);
+                               lp[10].target=lp[11].target=
+                               lp[12].target=&(s.flags);
+               lp[13].target=&(s.listenaddr);
 
                /* After the [generic] group, start parsing exports */
                if(i==1) {
@@ -770,19 +777,18 @@ void sigterm_handler(int s) {
  **/
 off_t size_autodetect(int fhandle) {
        off_t es;
-       unsigned long sectors;
+       u64 bytes;
        struct stat stat_buf;
        int error;
 
 #ifdef HAVE_SYS_MOUNT_H
 #ifdef HAVE_SYS_IOCTL_H
-#ifdef BLKGETSIZE
-       DEBUG("looking for export size with ioctl BLKGETSIZE\n");
-       if (!ioctl(fhandle, BLKGETSIZE, &sectors) && sectors) {
-               es = (off_t)sectors * (off_t)512;
-               return es;
+#ifdef BLKGETSIZE64
+       DEBUG("looking for export size with ioctl BLKGETSIZE64\n");
+       if (!ioctl(fhandle, BLKGETSIZE64, bytes) && bytes) {
+               return (off_t)bytes;
        }
-#endif /* BLKGETSIZE */
+#endif /* BLKGETSIZE64 */
 #endif /* HAVE_SYS_IOCTL_H */
 #endif /* HAVE_SYS_MOUNT_H */
 
@@ -884,6 +890,7 @@ ssize_t rawexpwrite(off_t a, char *buf, size_t len, CLIENT *client) {
        int fhandle;
        off_t foffset;
        size_t maxbytes;
+       ssize_t retval;
 
        if(get_filepos(client->export, a, &fhandle, &foffset, &maxbytes))
                return -1;
@@ -893,7 +900,11 @@ ssize_t rawexpwrite(off_t a, char *buf, size_t len, CLIENT *client) {
        DEBUG4("(WRITE to fd %d offset %llu len %u), ", fhandle, foffset, len);
 
        myseek(fhandle, foffset);
-       return write(fhandle, buf, len);
+       retval = write(fhandle, buf, len);
+       if(client->server->flags & F_SYNC) {
+               fsync(fhandle);
+       }
+       return retval;
 }
 
 /**
@@ -1201,6 +1212,7 @@ void setupexport(CLIENT* client) {
        for(i=0; ; i++) {
                FILE_INFO fi;
                gchar *tmpname;
+               gchar* error_string;
                mode_t mode = (client->server->flags & F_READONLY) ? O_RDONLY : O_RDWR;
 
                if(multifile) {
@@ -1225,7 +1237,10 @@ void setupexport(CLIENT* client) {
                if(fi.fhandle == -1) {
                        if(multifile && i>0)
                                break;
-                       err("Could not open exported file: %m");
+                       error_string=g_strdup_printf(
+                               "Could not open exported file %s: %%m",
+                               tmpname);
+                       err(error_string);
                }
                fi.startoff = laststartoff + lastsize;
                g_array_append_val(client->export, fi);