r23183: Check in a change made by Tridge:

[sfrench/samba-autobuild/.git] / source / smbd / trans2.c

diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index 835fd0cedba87821b765f9f234b86b3230a87e93..429fdc154d645f828aaeac5969bce99ae6a9e9d2 100644 (file)
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -3366,7 +3366,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn, char *inbuf, char *
                                return UNIXERROR(ERRDOS,ERRbadpath);
                        }
 
-                       delete_pending = get_delete_on_close_flag(sbuf.st_dev, sbuf.st_ino);
+                       delete_pending = get_delete_on_close_flag(file_id_sbuf(&sbuf));
                } else {
                        /*
                         * Original code - this is an open file.
@@ -3379,7 +3379,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn, char *inbuf, char *
                                return(UNIXERROR(ERRDOS,ERRbadfid));
                        }
                        pos = fsp->fh->position_information;
-                       delete_pending = get_delete_on_close_flag(sbuf.st_dev, sbuf.st_ino);
+                       delete_pending = get_delete_on_close_flag(file_id_sbuf(&sbuf));
                        access_mask = fsp->access_mask;
                }
        } else {
@@ -3432,7 +3432,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn, char *inbuf, char *
                        return UNIXERROR(ERRDOS,ERRbadpath);
                }
 
-               delete_pending = get_delete_on_close_flag(sbuf.st_dev, sbuf.st_ino);
+               delete_pending = get_delete_on_close_flag(file_id_sbuf(&sbuf));
                if (delete_pending) {
                        return ERROR_NT(NT_STATUS_DELETE_PENDING);
                }
@@ -3559,7 +3559,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                }
        } else {
                /* Do we have this path open ? */
-               files_struct *fsp1 = file_find_di_first(sbuf.st_dev, sbuf.st_ino);
+               files_struct *fsp1 = file_find_di_first(file_id_sbuf(&sbuf));
                if (fsp1 && !null_timespec(fsp1->pending_modtime)) {
                        /* the pending modtime overrides the current modtime */
                        mtime_ts = fsp1->pending_modtime;