From 6fbebb5369211b72545a1dd588bc6b9fa04210a1 Mon Sep 17 00:00:00 2001 From: Tim Prouty Date: Sun, 15 Feb 2009 23:38:53 -0800 Subject: s3: Modify SMB_VFS_FILE_ID_CREATE to take a stat struct Since file_id_create_dev is incompatible with the concept of file_ids, it is now static and in the one file that needs it. --- source3/smbd/oplock_irix.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'source3/smbd/oplock_irix.c') diff --git a/source3/smbd/oplock_irix.c b/source3/smbd/oplock_irix.c index bbc9132a08..89b8e0f7b5 100644 --- a/source3/smbd/oplock_irix.c +++ b/source3/smbd/oplock_irix.c @@ -103,6 +103,24 @@ static bool irix_oplocks_available(void) return True; } +/* + * This is bad because the file_id should always be created through the vfs + * layer! Unfortunately, a conn struct isn't available here. + */ +static struct file_id file_id_create_dev(SMB_DEV_T dev, SMB_INO_T inode) +{ + struct file_id key; + + /* the ZERO_STRUCT ensures padding doesn't break using the key as a + * blob */ + ZERO_STRUCT(key); + + key.devid = dev; + key.inode = inode; + + return key; +} + /**************************************************************************** * Deal with the IRIX kernel <--> smbd * oplock break protocol. -- cgit