From ee24c629a68e13764f78064121a6aea3d0e9240c Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sat, 5 Jan 2008 02:16:15 +0100
Subject: Remove superfluous fd parameter from SMB_VFS_FGET_NT_ACL().

Michael
(This used to be commit c0c7c1223da29c68359dac64a340c1c710d5f3d2)
---
 source3/smbd/dir.c     | 4 ++--
 source3/smbd/nttrans.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index ccf91fe57d..ab6e12f20f 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -948,7 +948,7 @@ static bool user_can_read_file(connection_struct *conn, char *name, SMB_STRUCT_S
 	}
 
 	/* Get NT ACL -allocated in main loop talloc context. No free needed here. */
-	status = SMB_VFS_FGET_NT_ACL(fsp, fsp->fh->fd,
+	status = SMB_VFS_FGET_NT_ACL(fsp,
 			(OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION), &psd);
 	close_file(fsp, NORMAL_CLOSE);
 
@@ -1007,7 +1007,7 @@ static bool user_can_write_file(connection_struct *conn, char *name, SMB_STRUCT_
 	}
 
 	/* Get NT ACL -allocated in main loop talloc context. No free needed here. */
-	status = SMB_VFS_FGET_NT_ACL(fsp, fsp->fh->fd,
+	status = SMB_VFS_FGET_NT_ACL(fsp,
 			(OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION), &psd);
 	close_file(fsp, NORMAL_CLOSE);
 
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index a51f3afd82..e7f9f0d36c 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -1643,7 +1643,7 @@ static void call_nt_transact_query_security_desc(connection_struct *conn,
 	} else {
 		if (fsp->fh->fd != -1) {
 			status = SMB_VFS_FGET_NT_ACL(
-				fsp, fsp->fh->fd, security_info_wanted, &psd);
+				fsp, security_info_wanted, &psd);
 		}
 		else {
 			status = SMB_VFS_GET_NT_ACL(
-- 
cgit 


From 05352cf2cb7f9710444d340f3f14ac6917fb0416 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sun, 6 Jan 2008 18:48:02 +0100
Subject: Remove superfluous parameter fd from SMB_VFS_FSET_NT_ACL().

Michael
(This used to be commit 4f2d139a186048f08180378a877b69d2f80ad51f)
---
 source3/smbd/nttrans.c | 3 +--
 source3/smbd/open.c    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index e7f9f0d36c..ae64c06215 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -769,8 +769,7 @@ static NTSTATUS set_sd(files_struct *fsp, uint8 *data, uint32 sd_len,
 	}
 
 	if (fsp->fh->fd != -1) {
-		status = SMB_VFS_FSET_NT_ACL(fsp, fsp->fh->fd,
-					     security_info_sent, psd);
+		status = SMB_VFS_FSET_NT_ACL(fsp, security_info_sent, psd);
 	}
 	else {
 		status = SMB_VFS_SET_NT_ACL(fsp, fsp->fsp_name,
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index f178102fdd..23d0223446 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2621,8 +2621,7 @@ NTSTATUS create_file_unixpath(connection_struct *conn,
 
 		fsp->access_mask = FILE_GENERIC_ALL;
 
-		status = SMB_VFS_FSET_NT_ACL(
-			fsp, fsp->fh->fd, sec_info_sent, sd);
+		status = SMB_VFS_FSET_NT_ACL(fsp, sec_info_sent, sd);
 
 		fsp->access_mask = saved_access_mask;
 
-- 
cgit 


From ca275e254985727c50b1b988c958a3743a7bc8ce Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 7 Jan 2008 00:14:19 +0100
Subject: Remove unneeded parameter fd from SMB_VFS_PREAD().

Michael
(This used to be commit 73e28806ce87d829ea7c38ed3440020845bb13bf)
---
 source3/smbd/fileio.c | 4 ++--
 source3/smbd/vfs.c    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c
index 8037510d80..a648326f89 100644
--- a/source3/smbd/fileio.c
+++ b/source3/smbd/fileio.c
@@ -77,7 +77,7 @@ ssize_t read_file(files_struct *fsp,char *data,SMB_OFF_T pos,size_t n)
 #ifdef DMF_FIX
 		int numretries = 3;
 tryagain:
-		readret = SMB_VFS_PREAD(fsp,fsp->fh->fd,data,n,pos);
+		readret = SMB_VFS_PREAD(fsp,data,n,pos);
 
 		if (readret == -1) {
 			if ((errno == EAGAIN) && numretries) {
@@ -89,7 +89,7 @@ tryagain:
 			return -1;
 		}
 #else /* NO DMF fix. */
-		readret = SMB_VFS_PREAD(fsp,fsp->fh->fd,data,n,pos);
+		readret = SMB_VFS_PREAD(fsp,data,n,pos);
 
 		if (readret == -1) {
 			return -1;
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index ed0406211d..bc272914c7 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -411,7 +411,7 @@ ssize_t vfs_pread_data(files_struct *fsp, char *buf,
 
 	while (total < byte_count)
 	{
-		ssize_t ret = SMB_VFS_PREAD(fsp, fsp->fh->fd, buf + total,
+		ssize_t ret = SMB_VFS_PREAD(fsp, buf + total,
 					byte_count - total, offset + total);
 
 		if (ret == 0) return total;
-- 
cgit 


From a56b417809805f8872c1e3238cce5d006d6189e4 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 7 Jan 2008 09:23:04 +0100
Subject: Remove redundant parameter fd from SMB_VFS_PWRITE().

Michael
(This used to be commit 8c4901a19ae2fd3ee085f9499f33aa7db016d182)
---
 source3/smbd/vfs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index bc272914c7..aa914797d1 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -485,8 +485,8 @@ ssize_t vfs_pwrite_data(struct smb_request *req,
 	}
 
 	while (total < N) {
-		ret = SMB_VFS_PWRITE(fsp, fsp->fh->fd, buffer + total,
-                                N - total, offset + total);
+		ret = SMB_VFS_PWRITE(fsp, buffer + total, N - total,
+				     offset + total);
 
 		if (ret == -1)
 			return -1;
@@ -641,7 +641,7 @@ int vfs_fill_sparse(files_struct *fsp, SMB_OFF_T len)
 	while (total < num_to_write) {
 		size_t curr_write_size = MIN(SPARSE_BUF_WRITE_SIZE, (num_to_write - total));
 
-		pwrite_ret = SMB_VFS_PWRITE(fsp, fsp->fh->fd, sparse_buf, curr_write_size, offset + total);
+		pwrite_ret = SMB_VFS_PWRITE(fsp, sparse_buf, curr_write_size, offset + total);
 		if (pwrite_ret == -1) {
 			DEBUG(10,("vfs_fill_sparse: SMB_VFS_PWRITE for file %s failed with error %s\n",
 				fsp->fsp_name, strerror(errno) ));
-- 
cgit 


From 6f657c873efa4779e762a8f9ede97e19da6fb7ec Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 7 Jan 2008 10:15:08 +0100
Subject: Remove redundant parameter fd from SMB_VFS_LSEEK().

Michael
(This used to be commit df929796f2698698d2875227bda8500589cca2df)
---
 source3/smbd/reply.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index d5e683ca3c..910e3a27a6 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -4091,7 +4091,7 @@ void reply_lseek(struct smb_request *req)
 	}
 
 	if (umode == SEEK_END) {
-		if((res = SMB_VFS_LSEEK(fsp,fsp->fh->fd,startpos,umode)) == -1) {
+		if((res = SMB_VFS_LSEEK(fsp,startpos,umode)) == -1) {
 			if(errno == EINVAL) {
 				SMB_OFF_T current_pos = startpos;
 				SMB_STRUCT_STAT sbuf;
@@ -4105,7 +4105,7 @@ void reply_lseek(struct smb_request *req)
 
 				current_pos += sbuf.st_size;
 				if(current_pos < 0)
-					res = SMB_VFS_LSEEK(fsp,fsp->fh->fd,0,SEEK_SET);
+					res = SMB_VFS_LSEEK(fsp,0,SEEK_SET);
 			}
 		}
 
@@ -6052,7 +6052,7 @@ NTSTATUS copy_file(TALLOC_CTX *ctx,
 	}
 
 	if ((ofun&3) == 1) {
-		if(SMB_VFS_LSEEK(fsp2,fsp2->fh->fd,0,SEEK_END) == -1) {
+		if(SMB_VFS_LSEEK(fsp2,0,SEEK_END) == -1) {
 			DEBUG(0,("copy_file: error - vfs lseek returned error %s\n", strerror(errno) ));
 			/*
 			 * Stop the copy from occurring.
-- 
cgit 


From 8dcce0d236b2102ca94fbcb7aa7126fe6733f2e7 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 7 Jan 2008 12:49:02 +0100
Subject: Remove redundant parameter fd from SMB_VFS_FSYNC().

Michael
(This used to be commit 8f83c9a7b245dbfef28195f9a7f33047a8ba95a0)
---
 source3/smbd/fileio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c
index a648326f89..5a4263739b 100644
--- a/source3/smbd/fileio.c
+++ b/source3/smbd/fileio.c
@@ -879,7 +879,7 @@ NTSTATUS sync_file(connection_struct *conn, files_struct *fsp, bool write_throug
 		if (ret == -1) {
 			return map_nt_error_from_unix(errno);
 		}
-		ret = SMB_VFS_FSYNC(fsp,fsp->fh->fd);
+		ret = SMB_VFS_FSYNC(fsp);
 		if (ret == -1) {
 			return map_nt_error_from_unix(errno);
 		}
-- 
cgit 


From 87a684f7fcfa8d9fabc42e33981299d0b33eeeb7 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 7 Jan 2008 13:21:26 +0100
Subject: Remove redundant parameter fd from SMB_VFS_FSTAT().

Michael
(This used to be commit 0b86c420be94d295f6917a220b5d699f65b46711)
---
 source3/smbd/fileio.c     | 4 ++--
 source3/smbd/open.c       | 6 +++---
 source3/smbd/posix_acls.c | 6 +++---
 source3/smbd/reply.c      | 8 ++++----
 source3/smbd/trans2.c     | 4 ++--
 source3/smbd/vfs.c        | 4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c
index 5a4263739b..1258b73cad 100644
--- a/source3/smbd/fileio.c
+++ b/source3/smbd/fileio.c
@@ -229,7 +229,7 @@ ssize_t write_file(struct smb_request *req,
 		SMB_STRUCT_STAT st;
 		fsp->modified = True;
 
-		if (SMB_VFS_FSTAT(fsp,fsp->fh->fd,&st) == 0) {
+		if (SMB_VFS_FSTAT(fsp, &st) == 0) {
 			int dosmode = dos_mode(fsp->conn,fsp->fsp_name,&st);
 			if ((lp_store_dos_attributes(SNUM(fsp->conn)) ||
 					MAP_ARCHIVE(fsp->conn)) &&
@@ -896,6 +896,6 @@ int fsp_stat(files_struct *fsp, SMB_STRUCT_STAT *pst)
 	if (fsp->fh->fd == -1) {
 		return SMB_VFS_STAT(fsp->conn, fsp->fsp_name, pst);
 	} else {
-		return SMB_VFS_FSTAT(fsp,fsp->fh->fd, pst);
+		return SMB_VFS_FSTAT(fsp, pst);
 	}
 }
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 23d0223446..d870374835 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -342,7 +342,7 @@ static NTSTATUS open_file(files_struct *fsp,
 		if (fsp->fh->fd == -1) {
 			ret = SMB_VFS_STAT(conn, path, psbuf);
 		} else {
-			ret = SMB_VFS_FSTAT(fsp,fsp->fh->fd,psbuf);
+			ret = SMB_VFS_FSTAT(fsp, psbuf);
 			/* If we have an fd, this stat should succeed. */
 			if (ret == -1) {
 				DEBUG(0,("Error doing fstat on open file %s "
@@ -1790,7 +1790,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
 		 * struct..
 		 */
 		if ((SMB_VFS_FTRUNCATE(fsp,fsp->fh->fd,0) == -1) ||
-		    (SMB_VFS_FSTAT(fsp,fsp->fh->fd,psbuf)==-1)) {
+		    (SMB_VFS_FSTAT(fsp, psbuf)==-1)) {
 			status = map_nt_error_from_unix(errno);
 			TALLOC_FREE(lck);
 			fd_close(fsp);
@@ -2675,7 +2675,7 @@ NTSTATUS create_file_unixpath(connection_struct *conn,
 			*psbuf = sbuf;
 		}
 		else {
-			SMB_VFS_FSTAT(fsp, fsp->fh->fd, psbuf);
+			SMB_VFS_FSTAT(fsp, psbuf);
 		}
 	}
 	return NT_STATUS_OK;
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 2810b5e587..f11aa69e08 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -3080,7 +3080,7 @@ NTSTATUS posix_fget_nt_acl(struct files_struct *fsp, uint32_t security_info,
 	}
 
 	/* Get the stat struct for the owner info. */
-	if(SMB_VFS_FSTAT(fsp,fsp->fh->fd,&sbuf) != 0) {
+	if(SMB_VFS_FSTAT(fsp, &sbuf) != 0) {
 		return map_nt_error_from_unix(errno);
 	}
 
@@ -3429,7 +3429,7 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
 		if(SMB_VFS_STAT(fsp->conn,fsp->fsp_name, &sbuf) != 0)
 			return map_nt_error_from_unix(errno);
 	} else {
-		if(SMB_VFS_FSTAT(fsp,fsp->fh->fd,&sbuf) != 0)
+		if(SMB_VFS_FSTAT(fsp, &sbuf) != 0)
 			return map_nt_error_from_unix(errno);
 	}
 
@@ -3479,7 +3479,7 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
 			if(fsp->fh->fd == -1)
 				ret = SMB_VFS_STAT(fsp->conn, fsp->fsp_name, &sbuf);
 			else
-				ret = SMB_VFS_FSTAT(fsp,fsp->fh->fd,&sbuf);
+				ret = SMB_VFS_FSTAT(fsp, &sbuf);
 
 			if(ret != 0)
 				return map_nt_error_from_unix(errno);
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 910e3a27a6..27f380a627 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2835,7 +2835,7 @@ void reply_readbraw(struct smb_request *req)
 		return;
 	}
 
-	if (SMB_VFS_FSTAT(fsp,fsp->fh->fd,&st) == 0) {
+	if (SMB_VFS_FSTAT(fsp, &st) == 0) {
 		size = st.st_size;
 	}
 
@@ -3096,7 +3096,7 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req,
 	SMB_STRUCT_STAT sbuf;
 	ssize_t nread = -1;
 
-	if(SMB_VFS_FSTAT(fsp,fsp->fh->fd, &sbuf) == -1) {
+	if(SMB_VFS_FSTAT(fsp, &sbuf) == -1) {
 		reply_unixerror(req, ERRDOS, ERRnoaccess);
 		return;
 	}
@@ -4096,7 +4096,7 @@ void reply_lseek(struct smb_request *req)
 				SMB_OFF_T current_pos = startpos;
 				SMB_STRUCT_STAT sbuf;
 
-				if(SMB_VFS_FSTAT(fsp,fsp->fh->fd, &sbuf) == -1) {
+				if(SMB_VFS_FSTAT(fsp, &sbuf) == -1) {
 					reply_unixerror(req, ERRDOS,
 							ERRnoaccess);
 					END_PROFILE(SMBlseek);
@@ -5485,7 +5485,7 @@ NTSTATUS rename_internals_fsp(connection_struct *conn,
 
 	/* Ensure we have a valid stat struct for the source. */
 	if (fsp->fh->fd != -1) {
-		if (SMB_VFS_FSTAT(fsp,fsp->fh->fd,&sbuf) == -1) {
+		if (SMB_VFS_FSTAT(fsp, &sbuf) == -1) {
 			return map_nt_error_from_unix(errno);
 		}
 	} else {
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index c3b5f9fa2f..ab6706aec7 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3663,7 +3663,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
 				return;
 			}
 
-			if (SMB_VFS_FSTAT(fsp,fsp->fh->fd,&sbuf) != 0) {
+			if (SMB_VFS_FSTAT(fsp, &sbuf) != 0) {
 				DEBUG(3,("fstat of fnum %d failed (%s)\n", fsp->fnum, strerror(errno)));
 				reply_unixerror(req, ERRDOS, ERRbadfid);
 				return;
@@ -6346,7 +6346,7 @@ static void call_trans2setfilepathinfo(connection_struct *conn,
 				return;
 			}
 
-			if (SMB_VFS_FSTAT(fsp, fsp->fh->fd, &sbuf) != 0) {
+			if (SMB_VFS_FSTAT(fsp, &sbuf) != 0) {
 				DEBUG(3,("call_trans2setfilepathinfo: fstat of fnum %d failed (%s)\n",fsp->fnum, strerror(errno)));
 				reply_unixerror(req, ERRDOS, ERRbadfid);
 				return;
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index aa914797d1..c7edac7b7a 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -525,7 +525,7 @@ int vfs_allocate_file_space(files_struct *fsp, SMB_BIG_UINT len)
 		return -1;
 	}
 
-	ret = SMB_VFS_FSTAT(fsp,fsp->fh->fd,&st);
+	ret = SMB_VFS_FSTAT(fsp, &st);
 	if (ret == -1)
 		return ret;
 
@@ -612,7 +612,7 @@ int vfs_fill_sparse(files_struct *fsp, SMB_OFF_T len)
 	ssize_t pwrite_ret;
 
 	release_level_2_oplocks_on_change(fsp);
-	ret = SMB_VFS_FSTAT(fsp,fsp->fh->fd,&st);
+	ret = SMB_VFS_FSTAT(fsp, &st);
 	if (ret == -1) {
 		return ret;
 	}
-- 
cgit 


From e614dec27f33c932c6c29c806d567fd6015cd5e6 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 7 Jan 2008 13:44:37 +0100
Subject: Remove redundant parameter fd from SMB_VFS_FCHMOD().

Michael
(This used to be commit a54d5604da556d1250ca9948d4acc4a187a9fede)
---
 source3/smbd/dosmode.c | 2 +-
 source3/smbd/open.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index a96f80ee0e..d3813f9b41 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -538,7 +538,7 @@ int file_set_dosmode(connection_struct *conn, const char *fname,
 		if (!NT_STATUS_IS_OK(open_file_fchmod(conn,fname,st,&fsp)))
 			return -1;
 		become_root();
-		ret = SMB_VFS_FCHMOD(fsp, fsp->fh->fd, unixmode);
+		ret = SMB_VFS_FCHMOD(fsp, unixmode);
 		unbecome_root();
 		close_file_fchmod(fsp);
 		if (!newfile) {
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index d870374835..c7b053d531 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1915,7 +1915,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
 		}
 
 		if ((ret == -1) &&
-		    (SMB_VFS_FCHMOD(fsp, fsp->fh->fd, new_unx_mode) == -1))
+		    (SMB_VFS_FCHMOD(fsp, new_unx_mode) == -1))
 			DEBUG(5, ("open_file_ntcreate: failed to reset "
 				  "attributes of file %s to 0%o\n",
 				  fname, (unsigned int)new_unx_mode));
-- 
cgit 


From 670909cb07e38a06bf5db12342b3b1189f0e1ab7 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 7 Jan 2008 14:26:00 +0100
Subject: Remove redundant parameter fd from SMB_VFS_FCHOWN().

Michael
(This used to be commit fbb193db3e0dc51cb000ae406a68bc547f31d9ab)
---
 source3/smbd/open.c       | 2 +-
 source3/smbd/posix_acls.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index c7b053d531..036e3e12a2 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -102,7 +102,7 @@ static void change_file_owner_to_parent(connection_struct *conn,
 	}
 
 	become_root();
-	ret = SMB_VFS_FCHOWN(fsp, fsp->fh->fd, parent_st.st_uid, (gid_t)-1);
+	ret = SMB_VFS_FCHOWN(fsp, parent_st.st_uid, (gid_t)-1);
 	unbecome_root();
 	if (ret == -1) {
 		DEBUG(0,("change_file_owner_to_parent: failed to fchown "
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index f11aa69e08..1aa3001923 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -3194,7 +3194,7 @@ int try_chown(connection_struct *conn, const char *fname, uid_t uid, gid_t gid)
 
 	become_root();
 	/* Keep the current file gid the same. */
-	ret = SMB_VFS_FCHOWN(fsp, fsp->fh->fd, uid, (gid_t)-1);
+	ret = SMB_VFS_FCHOWN(fsp, uid, (gid_t)-1);
 	unbecome_root();
 
 	close_file_fchmod(fsp);
-- 
cgit 


From b457b94bb86897b7020c6f300cd19a3d8e192610 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 7 Jan 2008 15:55:09 +0100
Subject: Remove redundant parameter fd from SMB_VFS_FTRUNCATE().

Michael
(This used to be commit 2ad66050a0452b8e7e08b1e7a01efa00c72fd451)
---
 source3/smbd/fileio.c | 2 +-
 source3/smbd/open.c   | 2 +-
 source3/smbd/vfs.c    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c
index 1258b73cad..8cea4989f5 100644
--- a/source3/smbd/fileio.c
+++ b/source3/smbd/fileio.c
@@ -184,7 +184,7 @@ static int wcp_file_size_change(files_struct *fsp)
 	write_cache *wcp = fsp->wcp;
 
 	wcp->file_size = wcp->offset + wcp->data_size;
-	ret = SMB_VFS_FTRUNCATE(fsp, fsp->fh->fd, wcp->file_size);
+	ret = SMB_VFS_FTRUNCATE(fsp, wcp->file_size);
 	if (ret == -1) {
 		DEBUG(0,("wcp_file_size_change (%s): ftruncate of size %.0f error %s\n",
 			fsp->fsp_name, (double)wcp->file_size, strerror(errno) ));
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 036e3e12a2..cc62e020da 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1789,7 +1789,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
 		 * We are modifing the file after open - update the stat
 		 * struct..
 		 */
-		if ((SMB_VFS_FTRUNCATE(fsp,fsp->fh->fd,0) == -1) ||
+		if ((SMB_VFS_FTRUNCATE(fsp, 0) == -1) ||
 		    (SMB_VFS_FSTAT(fsp, psbuf)==-1)) {
 			status = map_nt_error_from_unix(errno);
 			TALLOC_FREE(lck);
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index c7edac7b7a..9a5e0aff60 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -539,7 +539,7 @@ int vfs_allocate_file_space(files_struct *fsp, SMB_BIG_UINT len)
 				fsp->fsp_name, (double)st.st_size ));
 
 		flush_write_cache(fsp, SIZECHANGE_FLUSH);
-		if ((ret = SMB_VFS_FTRUNCATE(fsp, fsp->fh->fd, (SMB_OFF_T)len)) != -1) {
+		if ((ret = SMB_VFS_FTRUNCATE(fsp, (SMB_OFF_T)len)) != -1) {
 			set_filelen_write_cache(fsp, len);
 		}
 		return ret;
@@ -581,7 +581,7 @@ int vfs_set_filelen(files_struct *fsp, SMB_OFF_T len)
 	release_level_2_oplocks_on_change(fsp);
 	DEBUG(10,("vfs_set_filelen: ftruncate %s to len %.0f\n", fsp->fsp_name, (double)len));
 	flush_write_cache(fsp, SIZECHANGE_FLUSH);
-	if ((ret = SMB_VFS_FTRUNCATE(fsp, fsp->fh->fd, len)) != -1) {
+	if ((ret = SMB_VFS_FTRUNCATE(fsp, len)) != -1) {
 		set_filelen_write_cache(fsp, len);
 		notify_fname(fsp->conn, NOTIFY_ACTION_MODIFIED,
 			     FILE_NOTIFY_CHANGE_SIZE
-- 
cgit 


From 327cc04da587fa54f28dafb00267fde79b858349 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 7 Jan 2008 17:14:20 +0100
Subject: Remove redundant parameter fd from SMB_VFS_KERNEL_FLOCK().

Michael
(This used to be commit 195c519377c2fdc655e25760b52bc0694b8dda81)
---
 source3/smbd/open.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index cc62e020da..b618092a32 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1764,7 +1764,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
            the kernel refuses the operations then the kernel is wrong.
 	   note that GPFS supports it as well - jmcd */
 
-	ret_flock = SMB_VFS_KERNEL_FLOCK(fsp, fsp->fh->fd, share_access);
+	ret_flock = SMB_VFS_KERNEL_FLOCK(fsp, share_access);
 	if(ret_flock == -1 ){
 
 		TALLOC_FREE(lck);
-- 
cgit 


From 26169410cd3fa90be5740a913f027802488eca8d Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 7 Jan 2008 21:47:53 +0100
Subject: Remove redundant parameter fd from SMB_VFS_LINUX_SETLEASE().

Michael
(This used to be commit 8880eb82f16d561a4023ec8426f8ea35c579a7a6)
---
 source3/smbd/oplock_linux.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c
index 086f105b89..05021b6c74 100644
--- a/source3/smbd/oplock_linux.c
+++ b/source3/smbd/oplock_linux.c
@@ -164,7 +164,7 @@ static files_struct *linux_oplock_receive_message(fd_set *fds)
 
 static bool linux_set_kernel_oplock(files_struct *fsp, int oplock_type)
 {
-	if ( SMB_VFS_LINUX_SETLEASE(fsp,fsp->fh->fd, F_WRLCK) == -1) {
+	if ( SMB_VFS_LINUX_SETLEASE(fsp, F_WRLCK) == -1) {
 		DEBUG(3,("linux_set_kernel_oplock: Refused oplock on file %s, "
 			 "fd = %d, file_id = %s. (%s)\n",
 			 fsp->fsp_name, fsp->fh->fd, 
@@ -202,7 +202,7 @@ static void linux_release_kernel_oplock(files_struct *fsp)
 	/*
 	 * Remove the kernel oplock on this file.
 	 */
-	if ( SMB_VFS_LINUX_SETLEASE(fsp,fsp->fh->fd, F_UNLCK) == -1) {
+	if ( SMB_VFS_LINUX_SETLEASE(fsp, F_UNLCK) == -1) {
 		if (DEBUGLVL(0)) {
 			dbgtext("linux_release_kernel_oplock: Error when "
 				"removing kernel oplock on file " );
-- 
cgit 


From 62e9d503d82d645cf29af643732ad97c0eb8b340 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 7 Jan 2008 23:53:34 +0100
Subject: Remove redundant parameter fd from SMB_VFS_SYS_ACL_GET_FD().

Michael
(This used to be commit 42663e8736e1a3dfb57e0aafdcbf5fec880da779)
---
 source3/smbd/posix_acls.c | 8 ++++----
 source3/smbd/trans2.c     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 1aa3001923..b07033b8ac 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -3085,7 +3085,7 @@ NTSTATUS posix_fget_nt_acl(struct files_struct *fsp, uint32_t security_info,
 	}
 
 	/* Get the ACL from the fd. */
-	posix_acl = SMB_VFS_SYS_ACL_GET_FD(fsp, fsp->fh->fd);
+	posix_acl = SMB_VFS_SYS_ACL_GET_FD(fsp);
 
 	pal = fload_inherited_info(fsp);
 
@@ -3808,13 +3808,13 @@ int fchmod_acl(files_struct *fsp, int fd, mode_t mode)
 	SMB_ACL_T posix_acl = NULL;
 	int ret = -1;
 
-	if ((posix_acl = SMB_VFS_SYS_ACL_GET_FD(fsp, fd)) == NULL)
+	if ((posix_acl = SMB_VFS_SYS_ACL_GET_FD(fsp)) == NULL)
 		return -1;
 
 	if ((ret = chmod_acl_internals(conn, posix_acl, mode)) == -1)
 		goto done;
 
-	ret = SMB_VFS_SYS_ACL_SET_FD(fsp, fd, posix_acl);
+	ret = SMB_VFS_SYS_ACL_SET_FD(fsp, fsp->fh->fd, posix_acl);
 
   done:
 
@@ -4099,7 +4099,7 @@ static bool remove_posix_acl(connection_struct *conn, files_struct *fsp, const c
 
 	/* Get the current file ACL. */
 	if (fsp && fsp->fh->fd != -1) {
-		file_acl = SMB_VFS_SYS_ACL_GET_FD(fsp, fsp->fh->fd);
+		file_acl = SMB_VFS_SYS_ACL_GET_FD(fsp);
 	} else {
 		file_acl = SMB_VFS_SYS_ACL_GET_FILE( conn, fname, SMB_ACL_TYPE_ACCESS);
 	}
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index ab6706aec7..611f803210 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -4305,7 +4305,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 				uint16 num_def_acls = 0;
 
 				if (fsp && !fsp->is_directory && (fsp->fh->fd != -1)) {
-					file_acl = SMB_VFS_SYS_ACL_GET_FD(fsp, fsp->fh->fd);
+					file_acl = SMB_VFS_SYS_ACL_GET_FD(fsp);
 				} else {
 					file_acl = SMB_VFS_SYS_ACL_GET_FILE(conn, fname, SMB_ACL_TYPE_ACCESS);
 				}
-- 
cgit 


From b2182c11eab0e1b2f0acb5d82aec86d4598573eb Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 8 Jan 2008 01:14:24 +0100
Subject: Remove redundant parameter fd from SMB_VFS_FCHMOD_ACL().

Michael
(This used to be commit 7b201c177b3668f54751ba17d6a0b53ed913e7f7)
---
 source3/smbd/open.c       | 5 ++---
 source3/smbd/posix_acls.c | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index b618092a32..4abe017380 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1887,7 +1887,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
 		int saved_errno = errno; /* We might get ENOSYS in the next
 					  * call.. */
 
-		if (SMB_VFS_FCHMOD_ACL(fsp, fsp->fh->fd, unx_mode) == -1 &&
+		if (SMB_VFS_FCHMOD_ACL(fsp, unx_mode) == -1 &&
 		    errno == ENOSYS) {
 			errno = saved_errno; /* Ignore ENOSYS */
 		}
@@ -1901,8 +1901,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
 		{
 			int saved_errno = errno; /* We might get ENOSYS in the
 						  * next call.. */
-			ret = SMB_VFS_FCHMOD_ACL(fsp, fsp->fh->fd,
-						 new_unx_mode);
+			ret = SMB_VFS_FCHMOD_ACL(fsp, new_unx_mode);
 
 			if (ret == -1 && errno == ENOSYS) {
 				errno = saved_errno; /* Ignore ENOSYS */
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index b07033b8ac..23a246fea7 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -3802,7 +3802,7 @@ int inherit_access_acl(connection_struct *conn, const char *inherit_from_dir,
  and set the mask to rwx. Needed to preserve complex ACLs set by NT.
 ****************************************************************************/
 
-int fchmod_acl(files_struct *fsp, int fd, mode_t mode)
+int fchmod_acl(files_struct *fsp, mode_t mode)
 {
 	connection_struct *conn = fsp->conn;
 	SMB_ACL_T posix_acl = NULL;
-- 
cgit 


From 5921607f2647cec20a6bcebd17c5a0c53449c1ba Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 8 Jan 2008 01:54:19 +0100
Subject: Remove redundant parameter fd from SMB_VFS_SYS_ACL_SET_FD().

Michael
(This used to be commit 9296e93588c0e795cae770765050247ac1474a74)
---
 source3/smbd/posix_acls.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 23a246fea7..b6cb1d2e54 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -2573,7 +2573,7 @@ static bool set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, bool defau
 			}
 		}
 	} else {
-		if (SMB_VFS_SYS_ACL_SET_FD(fsp, fsp->fh->fd, the_acl) == -1) {
+		if (SMB_VFS_SYS_ACL_SET_FD(fsp, the_acl) == -1) {
 			/*
 			 * Some systems allow all the above calls and only fail with no ACL support
 			 * when attempting to apply the acl. HPUX with HFS is an example of this. JRA.
@@ -2589,7 +2589,7 @@ static bool set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, bool defau
 					fsp->fsp_name ));
 
 				become_root();
-				sret = SMB_VFS_SYS_ACL_SET_FD(fsp, fsp->fh->fd, the_acl);
+				sret = SMB_VFS_SYS_ACL_SET_FD(fsp, the_acl);
 				unbecome_root();
 				if (sret == 0) {
 					ret = True;
@@ -3814,7 +3814,7 @@ int fchmod_acl(files_struct *fsp, mode_t mode)
 	if ((ret = chmod_acl_internals(conn, posix_acl, mode)) == -1)
 		goto done;
 
-	ret = SMB_VFS_SYS_ACL_SET_FD(fsp, fsp->fh->fd, posix_acl);
+	ret = SMB_VFS_SYS_ACL_SET_FD(fsp, posix_acl);
 
   done:
 
@@ -4152,7 +4152,7 @@ static bool remove_posix_acl(connection_struct *conn, files_struct *fsp, const c
 
 	/* Set the new empty file ACL. */
 	if (fsp && fsp->fh->fd != -1) {
-		if (SMB_VFS_SYS_ACL_SET_FD(fsp, fsp->fh->fd, new_file_acl) == -1) {
+		if (SMB_VFS_SYS_ACL_SET_FD(fsp, new_file_acl) == -1) {
 			DEBUG(5,("remove_posix_acl: acl_set_file failed on %s (%s)\n",
 				fname, strerror(errno) ));
 			goto done;
@@ -4199,7 +4199,7 @@ bool set_unix_posix_acl(connection_struct *conn, files_struct *fsp, const char *
 
 	if (fsp && fsp->fh->fd != -1) {
 		/* The preferred way - use an open fd. */
-		if (SMB_VFS_SYS_ACL_SET_FD(fsp, fsp->fh->fd, file_acl) == -1) {
+		if (SMB_VFS_SYS_ACL_SET_FD(fsp, file_acl) == -1) {
 			DEBUG(5,("set_unix_posix_acl: acl_set_file failed on %s (%s)\n",
 				fname, strerror(errno) ));
 		        SMB_VFS_SYS_ACL_FREE_ACL(conn, file_acl);
-- 
cgit 


From 50ee744fa445b74136a8f2cef36c2b48ba7ee5f6 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 8 Jan 2008 10:00:47 +0100
Subject: Remove redundant parameter fd from SMB_VFS_FGETXATTR().

Michael
(This used to be commit 2cb739a82dc6bb194d60718cc74b26ee7c1c46a7)
---
 source3/smbd/posix_acls.c | 2 +-
 source3/smbd/trans2.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index b6cb1d2e54..be05ebd2ab 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -445,7 +445,7 @@ static struct pai_val *fload_inherited_info(files_struct *fsp)
 
 	do {
 		if (fsp->fh->fd != -1)
-			ret = SMB_VFS_FGETXATTR(fsp, fsp->fh->fd, SAMBA_POSIX_INHERITANCE_EA_NAME,
+			ret = SMB_VFS_FGETXATTR(fsp, SAMBA_POSIX_INHERITANCE_EA_NAME,
 					pai_buf, pai_buf_size);
 		else
 			ret = SMB_VFS_GETXATTR(fsp->conn,fsp->fsp_name,SAMBA_POSIX_INHERITANCE_EA_NAME,
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 611f803210..42914298fa 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -130,7 +130,7 @@ static bool get_ea_value(TALLOC_CTX *mem_ctx, connection_struct *conn, files_str
 	}
 
 	if (fsp && fsp->fh->fd != -1) {
-		sizeret = SMB_VFS_FGETXATTR(fsp, fsp->fh->fd, ea_name, val, attr_size);
+		sizeret = SMB_VFS_FGETXATTR(fsp, ea_name, val, attr_size);
 	} else {
 		sizeret = SMB_VFS_GETXATTR(conn, fname, ea_name, val, attr_size);
 	}
-- 
cgit 


From 9f691df852581b1ae4fab7cb9907606f4dcab291 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 8 Jan 2008 10:51:40 +0100
Subject: Remove redundant parameter fd from SMB_VFS_FLISTXATTR().

Michael
(This used to be commit 167649b3b8bc293f8434ffc9fb5f80463e4e75be)
---
 source3/smbd/trans2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 42914298fa..2958985b02 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -187,7 +187,7 @@ static struct ea_list *get_ea_list_from_file(TALLOC_CTX *mem_ctx, connection_str
 		}
 
 		if (fsp && fsp->fh->fd != -1) {
-			sizeret = SMB_VFS_FLISTXATTR(fsp, fsp->fh->fd, ea_namelist, ea_namelist_size);
+			sizeret = SMB_VFS_FLISTXATTR(fsp, ea_namelist, ea_namelist_size);
 		} else {
 			sizeret = SMB_VFS_LISTXATTR(conn, fname, ea_namelist, ea_namelist_size);
 		}
-- 
cgit 


From 1590dd32cfccd9ce73cd798330b5207bcc48bfaf Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 8 Jan 2008 11:29:09 +0100
Subject: Remove redundant parameter fd from SMB_VFS_FREMOVEXATTR().

Michael
(This used to be commit bfc3b5a27f707d3e4b8d5d66192891e22365fbb3)
---
 source3/smbd/posix_acls.c | 2 +-
 source3/smbd/trans2.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index be05ebd2ab..120e82c4b0 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -229,7 +229,7 @@ static void store_inheritance_attributes(files_struct *fsp, canon_ace *file_ace_
 	if (!pai_protected && num_inherited_entries(file_ace_list) == 0 && num_inherited_entries(dir_ace_list) == 0) {
 		/* Instead just remove the attribute if it exists. */
 		if (fsp->fh->fd != -1)
-			SMB_VFS_FREMOVEXATTR(fsp, fsp->fh->fd, SAMBA_POSIX_INHERITANCE_EA_NAME);
+			SMB_VFS_FREMOVEXATTR(fsp, SAMBA_POSIX_INHERITANCE_EA_NAME);
 		else
 			SMB_VFS_REMOVEXATTR(fsp->conn, fsp->fsp_name, SAMBA_POSIX_INHERITANCE_EA_NAME);
 		return;
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 2958985b02..c20d930433 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -355,7 +355,7 @@ NTSTATUS set_ea(connection_struct *conn, files_struct *fsp, const char *fname, s
 			if (fsp && (fsp->fh->fd != -1)) {
 				DEBUG(10,("set_ea: deleting ea name %s on file %s by file descriptor.\n",
 					unix_ea_name, fsp->fsp_name));
-				ret = SMB_VFS_FREMOVEXATTR(fsp, fsp->fh->fd, unix_ea_name);
+				ret = SMB_VFS_FREMOVEXATTR(fsp, unix_ea_name);
 			} else {
 				DEBUG(10,("set_ea: deleting ea name %s on file %s.\n",
 					unix_ea_name, fname));
-- 
cgit 


From aab6704ce803a738ba125895b20a31f242fe2885 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 8 Jan 2008 11:47:33 +0100
Subject: Remove redundant parameter fd from SMB_VFS_FSETXATTR().

Michael
(This used to be commit 0bd2643463a9160c8a1c7e1c2f8cca7b89060e09)
---
 source3/smbd/posix_acls.c | 2 +-
 source3/smbd/trans2.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 120e82c4b0..5f18615f66 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -238,7 +238,7 @@ static void store_inheritance_attributes(files_struct *fsp, canon_ace *file_ace_
 	pai_buf = create_pai_buf(file_ace_list, dir_ace_list, pai_protected, &store_size);
 
 	if (fsp->fh->fd != -1)
-		ret = SMB_VFS_FSETXATTR(fsp, fsp->fh->fd, SAMBA_POSIX_INHERITANCE_EA_NAME,
+		ret = SMB_VFS_FSETXATTR(fsp, SAMBA_POSIX_INHERITANCE_EA_NAME,
 				pai_buf, store_size, 0);
 	else
 		ret = SMB_VFS_SETXATTR(fsp->conn,fsp->fsp_name, SAMBA_POSIX_INHERITANCE_EA_NAME,
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index c20d930433..485513c734 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -373,7 +373,7 @@ NTSTATUS set_ea(connection_struct *conn, files_struct *fsp, const char *fname, s
 			if (fsp && (fsp->fh->fd != -1)) {
 				DEBUG(10,("set_ea: setting ea name %s on file %s by file descriptor.\n",
 					unix_ea_name, fsp->fsp_name));
-				ret = SMB_VFS_FSETXATTR(fsp, fsp->fh->fd, unix_ea_name,
+				ret = SMB_VFS_FSETXATTR(fsp, unix_ea_name,
 							ea_list->ea.value.data, ea_list->ea.value.length, 0);
 			} else {
 				DEBUG(10,("set_ea: setting ea name %s on file %s.\n",
-- 
cgit 


From 4a056e127ac35d640d899cd8a4735b927aa8d005 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 8 Jan 2008 12:20:51 +0100
Subject: Remove redundant parameter fd from SMB_VFS_AIO_CANCEL().

Michael
(This used to be commit 3c997ae0002d4c50e8899600c17ddf74ac61f6f0)
---
 source3/smbd/aio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/aio.c b/source3/smbd/aio.c
index bc1761b0fd..c8175f77ac 100644
--- a/source3/smbd/aio.c
+++ b/source3/smbd/aio.c
@@ -746,7 +746,7 @@ void cancel_aio_by_fsp(files_struct *fsp)
 			/* Don't delete the aio_extra record as we may have
 			   completed and don't yet know it. Just do the
 			   aio_cancel call and return. */
-			SMB_VFS_AIO_CANCEL(fsp,fsp->fh->fd, &aio_ex->acb);
+			SMB_VFS_AIO_CANCEL(fsp, &aio_ex->acb);
 			aio_ex->fsp = NULL; /* fsp will be closed when we
 					     * return. */
 		}
-- 
cgit