summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2012-06-07 16:13:36 +0200
committerStefan Metzmacher <metze@samba.org>2012-06-15 03:28:13 +0200
commit82a96d243214a748fa38bd10894309c3f6e6a20b (patch)
tree0454b0d70730ebc17bcf745039bf29859cb67009
parent98bd0d18db0ff6f08b38d409528a9e15b0d5b560 (diff)
downloadsamba-82a96d243214a748fa38bd10894309c3f6e6a20b.tar.gz
samba-82a96d243214a748fa38bd10894309c3f6e6a20b.tar.bz2
samba-82a96d243214a748fa38bd10894309c3f6e6a20b.zip
s3:smbd: refactor fsp_new() out of file_new()
Pair-Programmed-With: Volker Lendecke <vl@samba.org> Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
-rw-r--r--source3/smbd/files.c89
-rw-r--r--source3/smbd/proto.h2
2 files changed, 57 insertions, 34 deletions
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index d410083009..25749c2714 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -54,6 +54,54 @@ static unsigned long get_gen_count(struct smbd_server_connection *sconn)
return sconn->file_gen_counter;
}
+/**
+ * create new fsp to be used for file_new or a durable handle reconnect
+ */
+NTSTATUS fsp_new(struct connection_struct *conn, TALLOC_CTX *mem_ctx,
+ files_struct **result)
+{
+ NTSTATUS status = NT_STATUS_NO_MEMORY;
+ files_struct *fsp = NULL;
+ struct smbd_server_connection *sconn = conn->sconn;
+
+ fsp = talloc_zero(mem_ctx, struct files_struct);
+ if (fsp == NULL) {
+ goto fail;
+ }
+
+ /*
+ * This can't be a child of fsp because the file_handle can be ref'd
+ * when doing a dos/fcb open, which will then share the file_handle
+ * across multiple fsps.
+ */
+ fsp->fh = talloc_zero(mem_ctx, struct fd_handle);
+ if (fsp->fh == NULL) {
+ goto fail;
+ }
+
+ fsp->fh->ref_count = 1;
+ fsp->fh->fd = -1;
+
+ fsp->fnum = -1;
+ fsp->conn = conn;
+
+ DLIST_ADD(sconn->files, fsp);
+ sconn->num_files += 1;
+
+ conn->num_files_open++;
+
+ *result = fsp;
+ return NT_STATUS_OK;
+
+fail:
+ if (fsp != NULL) {
+ TALLOC_FREE(fsp->fh);
+ }
+ TALLOC_FREE(fsp);
+
+ return status;
+}
+
/****************************************************************************
Find first available file slot.
****************************************************************************/
@@ -66,6 +114,13 @@ NTSTATUS file_new(struct smb_request *req, connection_struct *conn,
files_struct *fsp;
NTSTATUS status;
+ status = fsp_new(conn, conn, &fsp);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
+
+ GetTimeOfDay(&fsp->open_time);
+
if (sconn->file_bmap != NULL) {
/*
@@ -92,36 +147,7 @@ NTSTATUS file_new(struct smb_request *req, connection_struct *conn,
*/
return NT_STATUS_TOO_MANY_OPENED_FILES;
}
- }
-
- /*
- * Make a child of the connection_struct as an fsp can't exist
- * independent of a connection.
- */
- fsp = talloc_zero(conn, struct files_struct);
- if (!fsp) {
- return NT_STATUS_NO_MEMORY;
- }
-
- /*
- * This can't be a child of fsp because the file_handle can be ref'd
- * when doing a dos/fcb open, which will then share the file_handle
- * across multiple fsps.
- */
- fsp->fh = talloc_zero(conn, struct fd_handle);
- if (!fsp->fh) {
- TALLOC_FREE(fsp);
- return NT_STATUS_NO_MEMORY;
- }
- fsp->fh->ref_count = 1;
- fsp->fh->fd = -1;
-
- fsp->fnum = -1;
- fsp->conn = conn;
- GetTimeOfDay(&fsp->open_time);
-
- if (sconn->file_bmap != NULL) {
sconn->first_file = (i+1) % (sconn->real_max_open_files);
bitmap_set(sconn->file_bmap, i);
@@ -132,11 +158,6 @@ NTSTATUS file_new(struct smb_request *req, connection_struct *conn,
fsp->fh->gen_id = get_gen_count(sconn);
}
- DLIST_ADD(sconn->files, fsp);
- sconn->num_files += 1;
-
- conn->num_files_open++;
-
/*
* Create an smb_filename with "" for the base_name. There are very
* few NULL checks, so make sure it's initialized with something. to
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 53d9e2dd37..7f341363f1 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -364,6 +364,8 @@ NTSTATUS filename_convert_with_privilege(TALLOC_CTX *mem_ctx,
/* The following definitions come from smbd/files.c */
+NTSTATUS fsp_new(struct connection_struct *conn, TALLOC_CTX *mem_ctx,
+ files_struct **result);
NTSTATUS file_new(struct smb_request *req, connection_struct *conn,
files_struct **result);
void file_close_conn(connection_struct *conn);