s3: Lift smbd_server_conn from file_fnum
authorVolker Lendecke <vl@samba.org>
Mon, 27 Sep 2010 00:37:59 +0000 (02:37 +0200)
committerVolker Lendecke <vl@samba.org>
Tue, 28 Sep 2010 05:36:15 +0000 (07:36 +0200)
source3/smbd/files.c

index 1715190cc325a5eb3604c66989e0b0f7b7de46d2..e903ab3f504824d4d6f5b0a20ee6d779b0e7e8a4 100644 (file)
@@ -484,15 +484,16 @@ void file_free(struct smb_request *req, files_struct *fsp)
  Get an fsp from a 16 bit fnum.
 ****************************************************************************/
 
  Get an fsp from a 16 bit fnum.
 ****************************************************************************/
 
-static struct files_struct *file_fnum(uint16 fnum)
+static struct files_struct *file_fnum(struct smbd_server_connection *sconn,
+                                     uint16 fnum)
 {
        files_struct *fsp;
        int count=0;
 
 {
        files_struct *fsp;
        int count=0;
 
-       for (fsp=smbd_server_conn->files;fsp;fsp=fsp->next, count++) {
+       for (fsp=sconn->files; fsp; fsp=fsp->next, count++) {
                if (fsp->fnum == fnum) {
                        if (count > 10) {
                if (fsp->fnum == fnum) {
                        if (count > 10) {
-                               DLIST_PROMOTE(smbd_server_conn->files, fsp);
+                               DLIST_PROMOTE(sconn->files, fsp);
                        }
                        return fsp;
                }
                        }
                        return fsp;
                }
@@ -512,7 +513,7 @@ files_struct *file_fsp(struct smb_request *req, uint16 fid)
                return req->chain_fsp;
        }
 
                return req->chain_fsp;
        }
 
-       fsp = file_fnum(fid);
+       fsp = file_fnum(smbd_server_conn, fid);
        if ((fsp != NULL) && (req != NULL)) {
                req->chain_fsp = fsp;
        }
        if ((fsp != NULL) && (req != NULL)) {
                req->chain_fsp = fsp;
        }