cifs: get rid of unused arguments of CIFSSMBWrite()

they used to be used, but...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index 95dab43646f040011011a7b1c4bce4446c80891b..4ead72a001f974d4e3b18dedf7a2466f4426c0e9 100644 (file)
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -392,8 +392,7 @@ extern int CIFSSMBRead(const unsigned int xid, struct cifs_io_parms *io_parms,
                        unsigned int *nbytes, char **buf,
                        int *return_buf_type);
 extern int CIFSSMBWrite(const unsigned int xid, struct cifs_io_parms *io_parms,
-                       unsigned int *nbytes, const char *buf,
-                       const char __user *ubuf, const int long_op);
+                       unsigned int *nbytes, const char *buf);
 extern int CIFSSMBWrite2(const unsigned int xid, struct cifs_io_parms *io_parms,
                        unsigned int *nbytes, struct kvec *iov, const int nvec);
 extern int CIFSGetSrvInodeNumber(const unsigned int xid, struct cifs_tcon *tcon,

diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index fb63e4c70cff6bbdb1451483b828dbc4920948c3..f82d2823622f334cf83e677c042ead92a0379b0a 100644 (file)
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -1228,7 +1228,6 @@ OldOpenRetry:
        inc_rfc1001_len(pSMB, count);
 
        pSMB->ByteCount = cpu_to_le16(count);
-       /* long_op set to 1 to allow for oplock break timeouts */
        rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
                        (struct smb_hdr *)pSMBr, &bytes_returned, 0);
        cifs_stats_inc(&tcon->stats.cifs_stats.num_opens);
@@ -1768,8 +1767,7 @@ CIFSSMBRead(const unsigned int xid, struct cifs_io_parms *io_parms,
 
 int
 CIFSSMBWrite(const unsigned int xid, struct cifs_io_parms *io_parms,
-            unsigned int *nbytes, const char *buf,
-            const char __user *ubuf, const int long_op)
+            unsigned int *nbytes, const char *buf)
 {
        int rc = -EACCES;
        WRITE_REQ *pSMB = NULL;
@@ -1838,12 +1836,7 @@ CIFSSMBWrite(const unsigned int xid, struct cifs_io_parms *io_parms,
                cpu_to_le16(offsetof(struct smb_com_write_req, Data) - 4);
        if (buf)
                memcpy(pSMB->Data, buf, bytes_sent);
-       else if (ubuf) {
-               if (copy_from_user(pSMB->Data, ubuf, bytes_sent)) {
-                       cifs_buf_release(pSMB);
-                       return -EFAULT;
-               }
-       } else if (count != 0) {
+       else if (count != 0) {
                /* No buffer */
                cifs_buf_release(pSMB);
                return -EINVAL;
@@ -1867,7 +1860,7 @@ CIFSSMBWrite(const unsigned int xid, struct cifs_io_parms *io_parms,
        }
 
        rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
-                        (struct smb_hdr *) pSMBr, &bytes_returned, long_op);
+                        (struct smb_hdr *) pSMBr, &bytes_returned, 0);
        cifs_stats_inc(&tcon->stats.cifs_stats.num_writes);
        if (rc) {
                cifs_dbg(FYI, "Send error in write = %d\n", rc);

diff --git a/fs/cifs/link.c b/fs/cifs/link.c
index 062c2375549a87acf716957593a58f213a972e06..d031af8d3d4da8b1d57cdb79236529e416d850e3 100644 (file)
--- a/fs/cifs/link.c
+++ b/fs/cifs/link.c
@@ -399,7 +399,7 @@ cifs_create_mf_symlink(unsigned int xid, struct cifs_tcon *tcon,
        io_parms.offset = 0;
        io_parms.length = CIFS_MF_SYMLINK_FILE_SIZE;
 
-       rc = CIFSSMBWrite(xid, &io_parms, pbytes_written, pbuf, NULL, 0);
+       rc = CIFSSMBWrite(xid, &io_parms, pbytes_written, pbuf);
        CIFSSMBClose(xid, tcon, fid.netfid);
        return rc;
 }