r23183: Check in a change made by Tridge:

This replaces the internal explicit dev/ino file id representation by a
"struct file_id". This is necessary as cluster file systems and NFS
don't necessarily assign the same device number to the shared file
system. With this structure in place we can now easily add different
schemes to map a file to a unique 64-bit device node.

Jeremy, you might note that I did not change the external interface of
smb_share_modes.c.

Volker
(This used to be commit 9b10dbbd5de8813fc15ebbb6be9b18010ffe8139)

10 files changed, 158 insertions, 193 deletions

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 38b4988415..c4aa2e2e28 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -155,6 +155,7 @@ static NTSTATUS close_remove_share_mode(files_struct *fsp,
 	struct share_mode_lock *lck;
 	SMB_STRUCT_STAT sbuf;
 	NTSTATUS status = NT_STATUS_OK;
+	struct file_id id;
 
 	/*
 	 * Lock the share entries, and determine if we should delete
@@ -162,7 +163,7 @@ static NTSTATUS close_remove_share_mode(files_struct *fsp,
 	 * This prevents race conditions with the file being created. JRA.
 	 */
 
-	lck = get_share_mode_lock(NULL, fsp->dev, fsp->inode, NULL, NULL);
+	lck = get_share_mode_lock(NULL, fsp->file_id, NULL, NULL);
 
 	if (lck == NULL) {
 		DEBUG(0, ("close_remove_share_mode: Could not get share mode "
@@ -258,15 +259,17 @@ static NTSTATUS close_remove_share_mode(files_struct *fsp,
 		goto done;
 	}
 
-	if(sbuf.st_dev != fsp->dev || sbuf.st_ino != fsp->inode) {
+	id = file_id_sbuf(&sbuf);
+
+	if (!file_id_equal(&fsp->file_id, &id)) {
 		DEBUG(5,("close_remove_share_mode: file %s. Delete on close "
 			 "was set and dev and/or inode does not match\n",
 			 fsp->fsp_name ));
-		DEBUG(5,("close_remove_share_mode: file %s. stored dev = %x, "
-			 "inode = %.0f stat dev = %x, inode = %.0f\n",
+		DEBUG(5,("close_remove_share_mode: file %s. stored file_id %s, "
+			 "stat file_id %s\n",
 			 fsp->fsp_name,
-			 (unsigned int)fsp->dev, (double)fsp->inode,
-			 (unsigned int)sbuf.st_dev, (double)sbuf.st_ino ));
+			 file_id_static_string(&fsp->file_id),
+			 file_id_static_string2(&id)));
 		/*
 		 * Don't save the errno here, we ignore this error
 		 */
@@ -405,7 +408,7 @@ static NTSTATUS close_directory(files_struct *fsp, enum file_close_type close_ty
 	 * reference to a directory also.
 	 */
 
-	lck = get_share_mode_lock(NULL, fsp->dev, fsp->inode, NULL, NULL);
+	lck = get_share_mode_lock(NULL, fsp->file_id, NULL, NULL);
 
 	if (lck == NULL) {
 		DEBUG(0, ("close_directory: Could not get share mode lock for %s\n", fsp->fsp_name));
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index eb86a0efd1..c26eba2ded 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -463,7 +463,7 @@ NTSTATUS unix_convert(connection_struct *conn,
 		} /* end else */
 
 #ifdef DEVELOPER
-		if (VALID_STAT(st) && get_delete_on_close_flag(st.st_dev, st.st_ino)) {
+		if (VALID_STAT(st) && get_delete_on_close_flag(file_id_sbuf(&st))) {
 			return NT_STATUS_DELETE_PENDING;
 		}
 #endif
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 062bebd58e..5ee0696ef9 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -38,8 +38,7 @@ static int files_used;
 /* A singleton cache to speed up searching by dev/inode. */
 static struct fsp_singleton_cache {
 	files_struct *fsp;
-	SMB_DEV_T dev;
-	SMB_INO_T inode;
+	struct file_id id;
 } fsp_fi_cache;
 
 /****************************************************************************
@@ -104,7 +103,7 @@ NTSTATUS file_new(connection_struct *conn, files_struct **result)
 	fsp->fh->fd = -1;
 
 	fsp->conn = conn;
-	fsp->fh->file_id = get_gen_count();
+	fsp->fh->gen_id = get_gen_count();
 	GetTimeOfDay(&fsp->open_time);
 
 	first_file = (i+1) % real_max_open_files;
@@ -233,9 +232,9 @@ void file_dump_open_table(void)
 	files_struct *fsp;
 
 	for (fsp=Files;fsp;fsp=fsp->next,count++) {
-		DEBUG(10,("Files[%d], fnum = %d, name %s, fd = %d, fileid = %lu, dev = %x, inode = %.0f\n",
-			count, fsp->fnum, fsp->fsp_name, fsp->fh->fd, (unsigned long)fsp->fh->file_id,
-			(unsigned int)fsp->dev, (double)fsp->inode ));
+		DEBUG(10,("Files[%d], fnum = %d, name %s, fd = %d, gen = %lu, fileid=%s\n",
+			count, fsp->fnum, fsp->fsp_name, fsp->fh->fd, (unsigned long)fsp->fh->gen_id,
+			  file_id_static_string(&fsp->file_id)));
 	}
 }
 
@@ -264,16 +263,15 @@ files_struct *file_find_fd(int fd)
  Find a fsp given a device, inode and file_id.
 ****************************************************************************/
 
-files_struct *file_find_dif(SMB_DEV_T dev, SMB_INO_T inode, unsigned long file_id)
+files_struct *file_find_dif(struct file_id id, unsigned long gen_id)
 {
 	int count=0;
 	files_struct *fsp;
 
 	for (fsp=Files;fsp;fsp=fsp->next,count++) {
 		/* We can have a fsp->fh->fd == -1 here as it could be a stat open. */
-		if (fsp->dev == dev && 
-		    fsp->inode == inode &&
-		    fsp->fh->file_id == file_id ) {
+		if (file_id_equal(&fsp->file_id, &id) &&
+		    fsp->fh->gen_id == gen_id ) {
 			if (count > 10) {
 				DLIST_PROMOTE(Files, fsp);
 			}
@@ -281,10 +279,11 @@ files_struct *file_find_dif(SMB_DEV_T dev, SMB_INO_T inode, unsigned long file_i
 			if ((fsp->fh->fd == -1) &&
 			    (fsp->oplock_type != NO_OPLOCK) &&
 			    (fsp->oplock_type != FAKE_LEVEL_II_OPLOCK)) {
-				DEBUG(0,("file_find_dif: file %s dev = %x, inode = %.0f, file_id = %u \
-oplock_type = %u is a stat open with oplock type !\n", fsp->fsp_name, (unsigned int)fsp->dev,
-						(double)fsp->inode, (unsigned int)fsp->fh->file_id,
-						(unsigned int)fsp->oplock_type ));
+				DEBUG(0,("file_find_dif: file %s file_id = %s, gen = %u \
+oplock_type = %u is a stat open with oplock type !\n", fsp->fsp_name, 
+					 file_id_static_string(&fsp->file_id),
+					 (unsigned int)fsp->fh->gen_id,
+					 (unsigned int)fsp->oplock_type ));
 				smb_panic("file_find_dif\n");
 			}
 			return fsp;
@@ -316,22 +315,20 @@ files_struct *file_find_fsp(files_struct *orig_fsp)
  calls.
 ****************************************************************************/
 
-files_struct *file_find_di_first(SMB_DEV_T dev, SMB_INO_T inode)
+files_struct *file_find_di_first(struct file_id id)
 {
 	files_struct *fsp;
 
-	if (fsp_fi_cache.dev == dev && fsp_fi_cache.inode == inode) {
+	if (file_id_equal(&fsp_fi_cache.id, &id)) {
 		/* Positive or negative cache hit. */
 		return fsp_fi_cache.fsp;
 	}
 
-	fsp_fi_cache.dev = dev;
-	fsp_fi_cache.inode = inode;
+	fsp_fi_cache.id = id;
 
 	for (fsp=Files;fsp;fsp=fsp->next) {
 		if ( fsp->fh->fd != -1 &&
-				fsp->dev == dev &&
-				fsp->inode == inode ) {
+		     file_id_equal(&fsp->file_id, &id)) {
 			/* Setup positive cache. */
 			fsp_fi_cache.fsp = fsp;
 			return fsp;
@@ -353,9 +350,9 @@ files_struct *file_find_di_next(files_struct *start_fsp)
 
 	for (fsp = start_fsp->next;fsp;fsp=fsp->next) {
 		if ( fsp->fh->fd != -1 &&
-				fsp->dev == start_fsp->dev &&
-				fsp->inode == start_fsp->inode )
+		     file_id_equal(&fsp->file_id, &start_fsp->file_id)) {
 			return fsp;
+		}
 	}
 
 	return NULL;
@@ -392,9 +389,7 @@ void fsp_set_pending_modtime(files_struct *tfsp, const struct timespec mod)
 	}
 
 	for (fsp = Files;fsp;fsp=fsp->next) {
-		if ( fsp->fh->fd != -1 &&
-				fsp->dev == tfsp->dev &&
-				fsp->inode == tfsp->inode ) {
+		if ( fsp->fh->fd != -1 && file_id_equal(&fsp->file_id, &tfsp->file_id)) {
 			fsp->pending_modtime = mod;
 			fsp->pending_modtime_owner = False;
 		}
@@ -542,8 +537,7 @@ NTSTATUS dup_file_fsp(files_struct *fsp,
 	dup_fsp->fh = fsp->fh;
 	dup_fsp->fh->ref_count++;
 
-	dup_fsp->dev = fsp->dev;
-	dup_fsp->inode = fsp->inode;
+	dup_fsp->file_id = fsp->file_id;
 	dup_fsp->initial_allocation_size = fsp->initial_allocation_size;
 	dup_fsp->mode = fsp->mode;
 	dup_fsp->file_pid = fsp->file_pid;
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index eb4a6cd969..e8919f9faf 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -2300,11 +2300,9 @@ static int call_nt_transact_ioctl(connection_struct *conn, char *inbuf, char *ou
 		if (pdata == NULL) {
 			return ERROR_NT(NT_STATUS_NO_MEMORY);
 		}
-		SINO_T_VAL(pdata,0,fsp->inode);
-		SDEV_T_VAL(pdata,8,fsp->dev);
+		push_file_id_16(pdata, &fsp->file_id);
 		memcpy(pdata+16,create_volume_objectid(conn,objid),16);
-		SINO_T_VAL(pdata,32,fsp->inode);
-		SDEV_T_VAL(pdata,40,fsp->dev);
+		push_file_id_16(pdata+32, &fsp->file_id);
 		send_nt_replies(inbuf, outbuf, bufsize, NT_STATUS_OK, NULL, 0, pdata, data_count);
 		return -1;
 	}
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 987da7a94d..30576f1e08 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -30,8 +30,7 @@ extern BOOL global_client_failed_oplock_break;
 
 struct deferred_open_record {
 	BOOL delayed_for_oplocks;
-	SMB_DEV_T dev;
-	SMB_INO_T inode;
+	struct file_id id;
 };
 
 /****************************************************************************
@@ -359,8 +358,7 @@ static NTSTATUS open_file(files_struct *fsp,
 	}
 
 	fsp->mode = psbuf->st_mode;
-	fsp->inode = psbuf->st_ino;
-	fsp->dev = psbuf->st_dev;
+	fsp->file_id = file_id_sbuf(psbuf);
 	fsp->vuid = current_user.vuid;
 	fsp->file_pid = global_smbpid;
 	fsp->can_lock = True;
@@ -513,7 +511,7 @@ static void validate_my_share_entries(int num,
 		return;
 	}
 
-	fsp = file_find_dif(share_entry->dev, share_entry->inode,
+	fsp = file_find_dif(share_entry->id,
 			    share_entry->share_file_id);
 	if (!fsp) {
 		DEBUG(0,("validate_my_share_entries: PANIC : %s\n",
@@ -803,7 +801,7 @@ static void defer_open(struct share_mode_lock *lck,
 				       (char *)state, sizeof(*state))) {
 		exit_server("push_deferred_smb_message failed");
 	}
-	add_deferred_open(lck, mid, request_time, state->dev, state->inode);
+	add_deferred_open(lck, mid, request_time, state->id);
 
 	/*
 	 * Push the MID of this packet on the signing queue.
@@ -871,8 +869,8 @@ static BOOL open_match_attributes(connection_struct *conn,
 ****************************************************************************/
 
 static files_struct *fcb_or_dos_open(connection_struct *conn,
-				     const char *fname, SMB_DEV_T dev,
-				     SMB_INO_T inode,
+				     const char *fname, 
+				     struct file_id id,
 				     uint32 access_mask,
 				     uint32 share_access,
 				     uint32 create_options)
@@ -883,7 +881,7 @@ static files_struct *fcb_or_dos_open(connection_struct *conn,
 	DEBUG(5,("fcb_or_dos_open: attempting old open semantics for "
 		 "file %s.\n", fname ));
 
-	for(fsp = file_find_di_first(dev, inode); fsp;
+	for(fsp = file_find_di_first(id); fsp;
 	    fsp = file_find_di_next(fsp)) {
 
 		DEBUG(10,("fcb_or_dos_open: checking file %s, fd = %d, "
@@ -1093,8 +1091,7 @@ static void schedule_defer_open(struct share_mode_lock *lck, struct timeval requ
 	   a 1 second delay for share mode conflicts. */
 
 	state.delayed_for_oplocks = True;
-	state.dev = lck->dev;
-	state.inode = lck->ino;
+	state.id = lck->id;
 
 	if (!request_timed_out(request_time, timeout)) {
 		defer_open(lck, request_time, timeout, &state);
@@ -1124,8 +1121,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
 	BOOL def_acl = False;
 	BOOL posix_open = False;
 	BOOL new_file_created = False;
-	SMB_DEV_T dev = 0;
-	SMB_INO_T inode = 0;
+	struct file_id id;
 	NTSTATUS fsp_open = NT_STATUS_ACCESS_DENIED;
 	files_struct *fsp = NULL;
 	mode_t new_unx_mode = (mode_t)0;
@@ -1142,6 +1138,8 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
 	char *parent_dir;
 	const char *newname;
 
+	ZERO_STRUCT(id);
+
 	if (conn->printer) {
 		/* 
 		 * Printers are handled completely differently.
@@ -1192,7 +1190,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
 		request_time = pml->request_time;
 
 		/* Remove the deferred open entry under lock. */
-		lck = get_share_mode_lock(NULL, state->dev, state->inode, NULL, NULL);
+		lck = get_share_mode_lock(NULL, state->id, NULL, NULL);
 		if (lck == NULL) {
 			DEBUG(0, ("could not get share mode lock\n"));
 		} else {
@@ -1404,8 +1402,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
 		return status;
 	}
 
-	fsp->dev = psbuf->st_dev;
-	fsp->inode = psbuf->st_ino;
+	fsp->file_id = file_id_sbuf(psbuf);
 	fsp->share_access = share_access;
 	fsp->fh->private_options = create_options;
 	fsp->access_mask = open_access_mask; /* We change this to the
@@ -1421,10 +1418,9 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
 	}
 
 	if (file_existed) {
-		dev = psbuf->st_dev;
-		inode = psbuf->st_ino;
+		id = file_id_sbuf(psbuf);
 
-		lck = get_share_mode_lock(NULL, dev, inode,
+		lck = get_share_mode_lock(NULL, id,
 					  conn->connectpath,
 					  fname);
 
@@ -1483,8 +1479,8 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
 
 				/* Use the client requested access mask here,
 				 * not the one we open with. */
-				fsp_dup = fcb_or_dos_open(conn, fname, dev,
-							  inode, access_mask,
+				fsp_dup = fcb_or_dos_open(conn, fname, id,
+							  access_mask,
 							  share_access,
 							  create_options);
 
@@ -1556,8 +1552,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
 				   a 1 second delay for share mode conflicts. */
 
 				state.delayed_for_oplocks = False;
-				state.dev = dev;
-				state.inode = inode;
+				state.id = id;
 
 				if (!request_timed_out(request_time,
 						       timeout)) {
@@ -1635,10 +1630,9 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
 		 * Nadav Danieli <nadavd@exanet.com>. JRA.
 		 */
 
-		dev = fsp->dev;
-		inode = fsp->inode;
+		id = fsp->file_id;
 
-		lck = get_share_mode_lock(NULL, dev, inode,
+		lck = get_share_mode_lock(NULL, id,
 					  conn->connectpath,
 					  fname);
 
@@ -1684,8 +1678,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
 			file_free(fsp);
 
 			state.delayed_for_oplocks = False;
-			state.dev = dev;
-			state.inode = inode;
+			state.id = id;
 
 			/* Do it all over again immediately. In the second
 			 * round we will find that the file existed and handle
@@ -2127,8 +2120,7 @@ NTSTATUS open_directory(connection_struct *conn,
 	 */
 	
 	fsp->mode = psbuf->st_mode;
-	fsp->inode = psbuf->st_ino;
-	fsp->dev = psbuf->st_dev;
+	fsp->file_id = file_id_sbuf(psbuf);
 	fsp->vuid = current_user.vuid;
 	fsp->file_pid = global_smbpid;
 	fsp->can_lock = False;
@@ -2149,7 +2141,7 @@ NTSTATUS open_directory(connection_struct *conn,
 
 	string_set(&fsp->fsp_name,fname);
 
-	lck = get_share_mode_lock(NULL, fsp->dev, fsp->inode,
+	lck = get_share_mode_lock(NULL, fsp->file_id,
 				  conn->connectpath,
 				  fname);
 
@@ -2255,8 +2247,7 @@ NTSTATUS open_file_stat(connection_struct *conn, const char *fname,
 	 */
 	
 	fsp->mode = psbuf->st_mode;
-	fsp->inode = psbuf->st_ino;
-	fsp->dev = psbuf->st_dev;
+	fsp->file_id = file_id_sbuf(psbuf);
 	fsp->vuid = current_user.vuid;
 	fsp->file_pid = global_smbpid;
 	fsp->can_lock = False;
@@ -2289,8 +2280,7 @@ void msg_file_was_renamed(struct messaging_context *msg,
 {
 	files_struct *fsp;
 	char *frm = (char *)data->data;
-	SMB_DEV_T dev;
-	SMB_INO_T inode;
+	struct file_id id;
 	const char *sharepath;
 	const char *newname;
 	size_t sp_len;
@@ -2303,17 +2293,16 @@ void msg_file_was_renamed(struct messaging_context *msg,
         }
 
 	/* Unpack the message. */
-	dev = DEV_T_VAL(frm,0);
-	inode = INO_T_VAL(frm,8);
+	pull_file_id_16(frm, &id);
 	sharepath = &frm[16];
 	newname = sharepath + strlen(sharepath) + 1;
 	sp_len = strlen(sharepath);
 
 	DEBUG(10,("msg_file_was_renamed: Got rename message for sharepath %s, new name %s, "
-		"dev %x, inode  %.0f\n",
-		sharepath, newname, (unsigned int)dev, (double)inode ));
+		"file_id %s\n",
+		  sharepath, newname, file_id_static_string(&id)));
 
-	for(fsp = file_find_di_first(dev, inode); fsp; fsp = file_find_di_next(fsp)) {
+	for(fsp = file_find_di_first(id); fsp; fsp = file_find_di_next(fsp)) {
 		if (memcmp(fsp->conn->connectpath, sharepath, sp_len) == 0) {
 	                DEBUG(10,("msg_file_was_renamed: renaming file fnum %d from %s -> %s\n",
 				fsp->fnum, fsp->fsp_name, newname ));
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 63f88b7824..9f3679390b 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -87,9 +87,8 @@ void process_kernel_oplocks(struct messaging_context *msg_ctx, fd_set *pfds)
 		}
 
 		/* Put the kernel break info into the message. */
-		SDEV_T_VAL(msg,0,fsp->dev);
-		SINO_T_VAL(msg,8,fsp->inode);
-		SIVAL(msg,16,fsp->fh->file_id);
+		push_file_id_16(msg, &fsp->file_id);
+		SIVAL(msg,16,fsp->fh->gen_id);
 
 		/* Don't need to be root here as we're only ever
 		   sending to ourselves. */
@@ -119,10 +118,10 @@ BOOL set_file_oplock(files_struct *fsp, int oplock_type)
 		exclusive_oplocks_open++;
 	}
 
-	DEBUG(5,("set_file_oplock: granted oplock on file %s, 0x%x/%.0f/%lu, "
+	DEBUG(5,("set_file_oplock: granted oplock on file %s, %s/%lu, "
 		    "tv_sec = %x, tv_usec = %x\n",
-		 fsp->fsp_name, (unsigned int)fsp->dev, (double)fsp->inode,
-		 fsp->fh->file_id, (int)fsp->open_time.tv_sec,
+		 fsp->fsp_name, file_id_static_string(&fsp->file_id),
+		 fsp->fh->gen_id, (int)fsp->open_time.tv_sec,
 		 (int)fsp->open_time.tv_usec ));
 
 	return True;
@@ -178,13 +177,11 @@ static void downgrade_file_oplock(files_struct *fsp)
 
 BOOL remove_oplock(files_struct *fsp)
 {
-	SMB_DEV_T dev = fsp->dev;
-	SMB_INO_T inode = fsp->inode;
 	BOOL ret;
 	struct share_mode_lock *lck;
 
 	/* Remove the oplock flag from the sharemode. */
-	lck = get_share_mode_lock(NULL, fsp->dev, fsp->inode, NULL, NULL);
+	lck = get_share_mode_lock(NULL, fsp->file_id, NULL, NULL);
 	if (lck == NULL) {
 		DEBUG(0,("remove_oplock: failed to lock share entry for "
 			 "file %s\n", fsp->fsp_name ));
@@ -193,9 +190,8 @@ BOOL remove_oplock(files_struct *fsp)
 	ret = remove_share_oplock(lck, fsp);
 	if (!ret) {
 		DEBUG(0,("remove_oplock: failed to remove share oplock for "
-			 "file %s fnum %d, 0x%x/%.0f\n",
-			 fsp->fsp_name, fsp->fnum, (unsigned int)dev,
-			 (double)inode));
+			 "file %s fnum %d, %s\n",
+			 fsp->fsp_name, fsp->fnum, file_id_static_string(&fsp->file_id)));
 	}
 	release_file_oplock(fsp);
 	TALLOC_FREE(lck);
@@ -207,12 +203,10 @@ BOOL remove_oplock(files_struct *fsp)
  */
 BOOL downgrade_oplock(files_struct *fsp)
 {
-	SMB_DEV_T dev = fsp->dev;
-	SMB_INO_T inode = fsp->inode;
 	BOOL ret;
 	struct share_mode_lock *lck;
 
-	lck = get_share_mode_lock(NULL, fsp->dev, fsp->inode, NULL, NULL);
+	lck = get_share_mode_lock(NULL, fsp->file_id, NULL, NULL);
 	if (lck == NULL) {
 		DEBUG(0,("downgrade_oplock: failed to lock share entry for "
 			 "file %s\n", fsp->fsp_name ));
@@ -221,9 +215,8 @@ BOOL downgrade_oplock(files_struct *fsp)
 	ret = downgrade_share_oplock(lck, fsp);
 	if (!ret) {
 		DEBUG(0,("downgrade_oplock: failed to downgrade share oplock "
-			 "for file %s fnum %d, dev = %x, inode = %.0f\n",
-			 fsp->fsp_name, fsp->fnum, (unsigned int)dev,
-			 (double)inode));
+			 "for file %s fnum %d, file_id %s\n",
+			 fsp->fsp_name, fsp->fnum, file_id_static_string(&fsp->file_id)));
 	}
 
 	downgrade_file_oplock(fsp);
@@ -289,13 +282,13 @@ static void wait_before_sending_break(void)
  Ensure that we have a valid oplock.
 ****************************************************************************/
 
-static files_struct *initial_break_processing(SMB_DEV_T dev, SMB_INO_T inode, unsigned long file_id)
+static files_struct *initial_break_processing(struct file_id id, unsigned long file_id)
 {
 	files_struct *fsp = NULL;
 
 	if( DEBUGLVL( 3 ) ) {
-		dbgtext( "initial_break_processing: called for 0x%x/%.0f/%u\n",
-			(unsigned int)dev, (double)inode, (int)file_id);
+		dbgtext( "initial_break_processing: called for %s/%u\n",
+			 file_id_static_string(&id), (int)file_id);
 		dbgtext( "Current oplocks_open (exclusive = %d, levelII = %d)\n",
 			exclusive_oplocks_open, level_II_oplocks_open );
 	}
@@ -306,14 +299,13 @@ static files_struct *initial_break_processing(SMB_DEV_T dev, SMB_INO_T inode, un
 	 * we have an oplock on it.
 	 */
 
-	fsp = file_find_dif(dev, inode, file_id);
+	fsp = file_find_dif(id, file_id);
 
 	if(fsp == NULL) {
 		/* The file could have been closed in the meantime - return success. */
 		if( DEBUGLVL( 3 ) ) {
 			dbgtext( "initial_break_processing: cannot find open file with " );
-			dbgtext( "dev = 0x%x, inode = %.0f file_id = %lu", (unsigned int)dev,
-				(double)inode, file_id);
+			dbgtext( "file_id %s gen_id = %lu", file_id_static_string(&id), file_id);
 			dbgtext( "allowing break to succeed.\n" );
 		}
 		return NULL;
@@ -332,8 +324,8 @@ static files_struct *initial_break_processing(SMB_DEV_T dev, SMB_INO_T inode, un
 	if(fsp->oplock_type == NO_OPLOCK) {
 		if( DEBUGLVL( 3 ) ) {
 			dbgtext( "initial_break_processing: file %s ", fsp->fsp_name );
-			dbgtext( "(dev = %x, inode = %.0f, file_id = %lu) has no oplock.\n",
-				(unsigned int)dev, (double)inode, fsp->fh->file_id );
+			dbgtext( "(file_id = %s gen_id = %lu) has no oplock.\n",
+				 file_id_static_string(&id), fsp->fh->gen_id );
 			dbgtext( "Allowing break to succeed regardless.\n" );
 		}
 		return NULL;
@@ -415,12 +407,10 @@ static void process_oplock_async_level2_break_message(struct messaging_context *
 	/* De-linearize incoming message. */
 	message_to_share_mode_entry(&msg, (char *)data->data);
 
-	DEBUG(10, ("Got oplock async level 2 break message from pid %d: 0x%x/%.0f/%lu\n",
-		   (int)procid_to_pid(&src), (unsigned int)msg.dev,
-		   (double)msg.inode, msg.share_file_id));
+	DEBUG(10, ("Got oplock async level 2 break message from pid %d: %s/%lu\n",
+		   (int)procid_to_pid(&src), file_id_static_string(&msg.id), msg.share_file_id));
 
-	fsp = initial_break_processing(msg.dev, msg.inode,
-				       msg.share_file_id);
+	fsp = initial_break_processing(msg.id, msg.share_file_id);
 
 	if (fsp == NULL) {
 		/* We hit a race here. Break messages are sent, and before we
@@ -505,12 +495,10 @@ static void process_oplock_break_message(struct messaging_context *msg_ctx,
 	/* De-linearize incoming message. */
 	message_to_share_mode_entry(&msg, (char *)data->data);
 
-	DEBUG(10, ("Got oplock break message from pid %d: 0x%x/%.0f/%lu\n",
-		   (int)procid_to_pid(&src), (unsigned int)msg.dev,
-		   (double)msg.inode, msg.share_file_id));
+	DEBUG(10, ("Got oplock break message from pid %d: %s/%lu\n",
+		   (int)procid_to_pid(&src), file_id_static_string(&msg.id), msg.share_file_id));
 
-	fsp = initial_break_processing(msg.dev, msg.inode,
-				       msg.share_file_id);
+	fsp = initial_break_processing(msg.id, msg.share_file_id);
 
 	if (fsp == NULL) {
 		/* a We hit race here. Break messages are sent, and before we
@@ -537,8 +525,8 @@ static void process_oplock_break_message(struct messaging_context *msg_ctx,
 
 	if (EXCLUSIVE_OPLOCK_TYPE(msg.op_type) &&
 	    !EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) {
-		DEBUG(3, ("Already downgraded oplock on 0x%x/%.0f: %s\n",
-			  (unsigned int)fsp->dev, (double)fsp->inode,
+		DEBUG(3, ("Already downgraded oplock on %s: %s\n",
+			  file_id_static_string(&fsp->file_id),
 			  fsp->fsp_name));
 		/* We just send the same message back. */
 		messaging_send_buf(msg_ctx, src, MSG_SMB_BREAK_RESPONSE,
@@ -599,8 +587,7 @@ static void process_kernel_oplock_break(struct messaging_context *msg_ctx,
 					struct server_id src,
 					DATA_BLOB *data)
 {
-	SMB_DEV_T dev;
-	SMB_INO_T inode;
+	struct file_id id;
 	unsigned long file_id;
 	files_struct *fsp;
 	char *break_msg;
@@ -617,15 +604,14 @@ static void process_kernel_oplock_break(struct messaging_context *msg_ctx,
 	}
 
 	/* Pull the data from the message. */
-	dev = DEV_T_VAL(data->data, 0);
-	inode = INO_T_VAL(data->data, 8);
+	pull_file_id_16((char *)data->data, &id);
 	file_id = (unsigned long)IVAL(data->data, 16);
 
-	DEBUG(10, ("Got kernel oplock break message from pid %d: 0x%x/%.0f/%u\n",
-		   (int)procid_to_pid(&src), (unsigned int)dev, (double)inode,
+	DEBUG(10, ("Got kernel oplock break message from pid %d: %s/%u\n",
+		   (int)procid_to_pid(&src), file_id_static_string(&id),
 		   (unsigned int)file_id));
 
-	fsp = initial_break_processing(dev, inode, file_id);
+	fsp = initial_break_processing(id, file_id);
 
 	if (fsp == NULL) {
 		DEBUG(3, ("Got a kernel oplock break message for a file "
@@ -711,9 +697,8 @@ static void process_oplock_break_response(struct messaging_context *msg_ctx,
 	/* De-linearize incoming message. */
 	message_to_share_mode_entry(&msg, (char *)data->data);
 
-	DEBUG(10, ("Got oplock break response from pid %d: 0x%x/%.0f/%lu mid %u\n",
-		   (int)procid_to_pid(&src), (unsigned int)msg.dev,
-		   (double)msg.inode, msg.share_file_id,
+	DEBUG(10, ("Got oplock break response from pid %d: %s/%lu mid %u\n",
+		   (int)procid_to_pid(&src), file_id_static_string(&msg.id), msg.share_file_id,
 		   (unsigned int)msg.op_mid));
 
 	/* Here's the hack from open.c, store the mid in the 'port' field */
@@ -741,9 +726,8 @@ static void process_open_retry_message(struct messaging_context *msg_ctx,
 	/* De-linearize incoming message. */
 	message_to_share_mode_entry(&msg, (char *)data->data);
 
-	DEBUG(10, ("Got open retry msg from pid %d: 0x%x/%.0f/%lu mid %u\n",
-		   (int)procid_to_pid(&src), (unsigned int)msg.dev,
-		   (double)msg.inode, msg.share_file_id,
+	DEBUG(10, ("Got open retry msg from pid %d: %s mid %u\n",
+		   (int)procid_to_pid(&src), file_id_static_string(&msg.id),
 		   (unsigned int)msg.op_mid));
 
 	schedule_deferred_open_smb_message(msg.op_mid);
@@ -771,7 +755,7 @@ void release_level_2_oplocks_on_change(files_struct *fsp)
 	if (!LEVEL_II_OPLOCK_TYPE(fsp->oplock_type))
 		return;
 
-	lck = get_share_mode_lock(NULL, fsp->dev, fsp->inode, NULL, NULL);
+	lck = get_share_mode_lock(NULL, fsp->file_id, NULL, NULL);
 	if (lck == NULL) {
 		DEBUG(0,("release_level_2_oplocks_on_change: failed to lock "
 			 "share mode entry for file %s.\n", fsp->fsp_name ));
@@ -845,8 +829,7 @@ void share_mode_entry_to_message(char *msg, struct share_mode_entry *e)
 	SIVAL(msg,16,e->private_options);
 	SIVAL(msg,20,(uint32)e->time.tv_sec);
 	SIVAL(msg,24,(uint32)e->time.tv_usec);
-	SDEV_T_VAL(msg,28,e->dev);
-	SINO_T_VAL(msg,36,e->inode);
+	push_file_id_16(msg+28, &e->id);
 	SIVAL(msg,44,e->share_file_id);
 	SIVAL(msg,48,e->uid);
 	SSVAL(msg,52,e->flags);
@@ -866,8 +849,7 @@ void message_to_share_mode_entry(struct share_mode_entry *e, char *msg)
 	e->private_options = IVAL(msg,16);
 	e->time.tv_sec = (time_t)IVAL(msg,20);
 	e->time.tv_usec = (int)IVAL(msg,24);
-	e->dev = DEV_T_VAL(msg,28);
-	e->inode = INO_T_VAL(msg,36);
+	pull_file_id_16(msg+28, &e->id);
 	e->share_file_id = (unsigned long)IVAL(msg,44);
 	e->uid = (uint32)IVAL(msg,48);
 	e->flags = (uint16)SVAL(msg,52);
diff --git a/source3/smbd/oplock_irix.c b/source3/smbd/oplock_irix.c
index c1159cd73b..1ac0cb4674 100644
--- a/source3/smbd/oplock_irix.c
+++ b/source3/smbd/oplock_irix.c
@@ -149,9 +149,9 @@ static files_struct *irix_oplock_receive_message(fd_set *fds)
 	}
      
 	DEBUG(5,("irix_oplock_receive_message: kernel oplock break request "
-		 "received for dev = %x, inode = %.0f\n, file_id = %ul",
-		 (unsigned int)fsp->dev, (double)fsp->inode,
-		 fsp->fh->file_id ));
+		 "received for file_id %s gen_id = %ul",
+		 file_id_static_string(&fsp->file_id),
+		 fsp->fh->gen_id ));
 
 	return fsp;
 }
@@ -165,27 +165,27 @@ static BOOL irix_set_kernel_oplock(files_struct *fsp, int oplock_type)
 	if (sys_fcntl_long(fsp->fh->fd, F_OPLKREG, oplock_pipe_write) == -1) {
 		if(errno != EAGAIN) {
 			DEBUG(0,("irix_set_kernel_oplock: Unable to get "
-				 "kernel oplock on file %s, dev = %x, inode "
-				 "= %.0f, file_id = %ul. Error was %s\n", 
-				 fsp->fsp_name, (unsigned int)fsp->dev,
-				 (double)fsp->inode, fsp->fh->file_id,
+				 "kernel oplock on file %s, file_id %s "
+				 "gen_id = %ul. Error was %s\n", 
+				 fsp->fsp_name, file_id_static_string(&fsp->file_id), 
+				 fsp->fh->gen_id,
 				 strerror(errno) ));
 		} else {
 			DEBUG(5,("irix_set_kernel_oplock: Refused oplock on "
-				 "file %s, fd = %d, dev = %x, inode = %.0f, "
-				 "file_id = %ul. Another process had the file "
+				 "file %s, fd = %d, file_id = 5s, "
+				 "gen_id = %ul. Another process had the file "
 				 "open.\n",
 				 fsp->fsp_name, fsp->fh->fd,
-				 (unsigned int)fsp->dev, (double)fsp->inode,
-				 fsp->fh->file_id ));
+				 file_id_static_string(&fsp->file_id),
+				 fsp->fh->gen_id ));
 		}
 		return False;
 	}
 	
-	DEBUG(10,("irix_set_kernel_oplock: got kernel oplock on file %s, dev "
-		  "= %x, inode = %.0f, file_id = %ul\n",
-		  fsp->fsp_name, (unsigned int)fsp->dev, (double)fsp->inode,
-		  fsp->fh->file_id));
+	DEBUG(10,("irix_set_kernel_oplock: got kernel oplock on file %s, file_id = %s "
+		  "gen_id = %ul\n",
+		  fsp->fsp_name, file_id_static_string(&fsp->file_id),
+		  fsp->fh->gen_id));
 
 	return True;
 }
@@ -202,10 +202,10 @@ static void irix_release_kernel_oplock(files_struct *fsp)
 		 * oplock state of this file.
 		 */
 		int state = sys_fcntl_long(fsp->fh->fd, F_OPLKACK, -1);
-		dbgtext("irix_release_kernel_oplock: file %s, dev = %x, "
-			"inode = %.0f file_id = %ul, has kernel oplock state "
-			"of %x.\n", fsp->fsp_name, (unsigned int)fsp->dev,
-                        (double)fsp->inode, fsp->fh->file_id, state );
+		dbgtext("irix_release_kernel_oplock: file %s, file_id = %s"
+			"gen_id = %ul, has kernel oplock state "
+			"of %x.\n", fsp->fsp_name, file_id_static_string(&fsp->file_id),
+                        fsp->fh->gen_id, state );
 	}
 
 	/*
@@ -215,10 +215,10 @@ static void irix_release_kernel_oplock(files_struct *fsp)
 		if( DEBUGLVL( 0 )) {
 			dbgtext("irix_release_kernel_oplock: Error when "
 				"removing kernel oplock on file " );
-			dbgtext("%s, dev = %x, inode = %.0f, file_id = %ul. "
+			dbgtext("%s, file_id = %s gen_id = %ul. "
 				"Error was %s\n",
-				fsp->fsp_name, (unsigned int)fsp->dev, 
-				(double)fsp->inode, fsp->fh->file_id,
+				fsp->fsp_name, file_id_static_string(&fsp->file_id),
+				fsp->fh->gen_id,
 				strerror(errno) );
 		}
 	}
diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c
index 14db98cde6..e12a9d66ca 100644
--- a/source3/smbd/oplock_linux.c
+++ b/source3/smbd/oplock_linux.c
@@ -167,17 +167,17 @@ static BOOL linux_set_kernel_oplock(files_struct *fsp, int oplock_type)
 {
 	if ( SMB_VFS_LINUX_SETLEASE(fsp,fsp->fh->fd, F_WRLCK) == -1) {
 		DEBUG(3,("linux_set_kernel_oplock: Refused oplock on file %s, "
-			 "fd = %d, dev = %x, inode = %.0f. (%s)\n",
+			 "fd = %d, file_id = %s. (%s)\n",
 			 fsp->fsp_name, fsp->fh->fd, 
-			 (unsigned int)fsp->dev, (double)fsp->inode,
+			 file_id_static_string(&fsp->file_id),
 			 strerror(errno)));
 		return False;
 	}
 	
 	DEBUG(3,("linux_set_kernel_oplock: got kernel oplock on file %s, "
-		 "dev = %x, inode = %.0f, file_id = %lu\n",
-		  fsp->fsp_name, (unsigned int)fsp->dev, (double)fsp->inode,
-		 fsp->fh->file_id));
+		 "file_id = %s gen_id = %lu\n",
+		 fsp->fsp_name, file_id_static_string(&fsp->file_id),
+		 fsp->fh->gen_id));
 
 	return True;
 }
@@ -194,10 +194,10 @@ static void linux_release_kernel_oplock(files_struct *fsp)
 		 * oplock state of this file.
 		 */
 		int state = fcntl(fsp->fh->fd, F_GETLEASE, 0);
-		dbgtext("linux_release_kernel_oplock: file %s, dev = %x, "
-			"inode = %.0f file_id = %lu has kernel oplock state "
-			"of %x.\n", fsp->fsp_name, (unsigned int)fsp->dev,
-                        (double)fsp->inode, fsp->fh->file_id, state );
+		dbgtext("linux_release_kernel_oplock: file %s, file_id = %s "
+			"gen_id = %lu has kernel oplock state "
+			"of %x.\n", fsp->fsp_name, file_id_static_string(&fsp->file_id),
+			fsp->fh->gen_id, state );
 	}
 
 	/*
@@ -207,10 +207,10 @@ static void linux_release_kernel_oplock(files_struct *fsp)
 		if (DEBUGLVL(0)) {
 			dbgtext("linux_release_kernel_oplock: Error when "
 				"removing kernel oplock on file " );
-			dbgtext("%s, dev = %x, inode = %.0f, file_id = %lu. "
+			dbgtext("%s, file_id = %s, gen_id = %lu. "
 				"Error was %s\n", fsp->fsp_name,
-				(unsigned int)fsp->dev, (double)fsp->inode,
-				fsp->fh->file_id, strerror(errno) );
+				file_id_static_string(&fsp->file_id),
+				fsp->fh->gen_id, strerror(errno) );
 		}
 	}
 }
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 40311758c9..6d4c08b663 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -4171,12 +4171,12 @@ static BOOL resolve_wildcards(const char *name1, char *name2)
 ****************************************************************************/
 
 static void rename_open_files(connection_struct *conn, struct share_mode_lock *lck,
-				SMB_DEV_T dev, SMB_INO_T inode, const char *newname)
+			      struct file_id id, const char *newname)
 {
 	files_struct *fsp;
 	BOOL did_rename = False;
 
-	for(fsp = file_find_di_first(dev, inode); fsp; fsp = file_find_di_next(fsp)) {
+	for(fsp = file_find_di_first(id); fsp; fsp = file_find_di_next(fsp)) {
 		/* fsp_name is a relative path under the fsp. To change this for other
 		   sharepaths we need to manipulate relative paths. */
 		/* TODO - create the absolute path and manipulate the newname
@@ -4184,16 +4184,16 @@ static void rename_open_files(connection_struct *conn, struct share_mode_lock *l
 		if (fsp->conn != conn) {
 			continue;
 		}
-		DEBUG(10,("rename_open_files: renaming file fnum %d (dev = %x, inode = %.0f) from %s -> %s\n",
-			fsp->fnum, (unsigned int)fsp->dev, (double)fsp->inode,
+		DEBUG(10,("rename_open_files: renaming file fnum %d (file_id %s) from %s -> %s\n",
+			  fsp->fnum, file_id_static_string(&fsp->file_id),
 			fsp->fsp_name, newname ));
 		string_set(&fsp->fsp_name, newname);
 		did_rename = True;
 	}
 
 	if (!did_rename) {
-		DEBUG(10,("rename_open_files: no open files on dev %x, inode %.0f for %s\n",
-			(unsigned int)dev, (double)inode, newname ));
+		DEBUG(10,("rename_open_files: no open files on file_id %s for %s\n",
+			  file_id_static_string(&id), newname ));
 	}
 
 	/* Send messages to all smbd's (not ourself) that the name has changed. */
@@ -4341,7 +4341,7 @@ NTSTATUS rename_internals_fsp(connection_struct *conn, files_struct *fsp, pstrin
 		return NT_STATUS_ACCESS_DENIED;
 	}
 
-	lck = get_share_mode_lock(NULL, fsp->dev, fsp->inode, NULL, NULL);
+	lck = get_share_mode_lock(NULL, fsp->file_id, NULL, NULL);
 
 	if(SMB_VFS_RENAME(conn,fsp->fsp_name, newname) == 0) {
 		uint32 create_options = fsp->fh->private_options;
@@ -4349,7 +4349,7 @@ NTSTATUS rename_internals_fsp(connection_struct *conn, files_struct *fsp, pstrin
 		DEBUG(3,("rename_internals_fsp: succeeded doing rename on %s -> %s\n",
 			fsp->fsp_name,newname));
 
-		rename_open_files(conn, lck, fsp->dev, fsp->inode, newname);
+		rename_open_files(conn, lck, fsp->file_id, newname);
 
 		/*
 		 * A rename acts as a new file create w.r.t. allowing an initial delete
@@ -4457,6 +4457,7 @@ NTSTATUS rename_internals(connection_struct *conn,
 	const char *dname;
 	long offset = 0;
 	pstring destname;
+	struct file_id id;
 
 	*directory = *mask = 0;
 
@@ -4635,9 +4636,10 @@ NTSTATUS rename_internals(connection_struct *conn,
 		 * don't do the rename, just return success.
 		 */
 
+		id = file_id_sbuf(&sbuf1);
+
 		if (strcsequal(directory, newname)) {
-			rename_open_files(conn, NULL, sbuf1.st_dev,
-					  sbuf1.st_ino, newname);
+			rename_open_files(conn, NULL, id, newname);
 			DEBUG(3, ("rename_internals: identical names in "
 				  "rename %s - returning success\n",
 				  directory));
@@ -4654,14 +4656,12 @@ NTSTATUS rename_internals(connection_struct *conn,
 			return NT_STATUS_SHARING_VIOLATION;
 		}
 
-		lck = get_share_mode_lock(NULL, sbuf1.st_dev, sbuf1.st_ino,
-					  NULL, NULL);
+		lck = get_share_mode_lock(NULL, id, NULL, NULL);
 
 		if(SMB_VFS_RENAME(conn,directory, newname) == 0) {
 			DEBUG(3,("rename_internals: succeeded doing rename "
 				 "on %s -> %s\n", directory, newname));
-			rename_open_files(conn, lck, sbuf1.st_dev,
-					  sbuf1.st_ino, newname);
+			rename_open_files(conn, lck, id, newname);
 			TALLOC_FREE(lck);
 			notify_rename(conn, S_ISDIR(sbuf1.st_mode),
 				      directory, newname);
@@ -4768,9 +4768,10 @@ NTSTATUS rename_internals(connection_struct *conn,
 			return status;
 		}
 
+		id = file_id_sbuf(&sbuf1);
+
 		if (strcsequal(fname,destname)) {
-			rename_open_files(conn, NULL, sbuf1.st_dev,
-					  sbuf1.st_ino, newname);
+			rename_open_files(conn, NULL, id, newname);
 			DEBUG(3,("rename_internals: identical names "
 				 "in wildcard rename %s - success\n",
 				 fname));
@@ -4789,12 +4790,10 @@ NTSTATUS rename_internals(connection_struct *conn,
 			return NT_STATUS_SHARING_VIOLATION;
 		}
 
-		lck = get_share_mode_lock(NULL, sbuf1.st_dev,
-					  sbuf1.st_ino, NULL, NULL);
+		lck = get_share_mode_lock(NULL, id, NULL, NULL);
 
 		if (!SMB_VFS_RENAME(conn,fname,destname)) {
-			rename_open_files(conn, lck, sbuf1.st_dev,
-					  sbuf1.st_ino, newname);
+			rename_open_files(conn, lck, id, newname);
 			count++;
 			status = NT_STATUS_OK;
 		}
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 835fd0cedb..429fdc154d 100644
--- a/source3/smbd/trans2.c
+++ b/source3/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;