diff options
| author | Zwane Mwaikambo <zwane@linuxpower.ca> | 2004-06-26 20:54:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-26 20:54:22 -0700 |
| commit | 5ae39e5545dd5ddd0e7cc3fa35deb13ccc315c75 (patch) | |
| tree | 9b4587ce2d00bcc3cc1cbfa1733e75fa73e3c7c3 | |
| parent | 7cb87888f88297e102884326e074a61d2d29cc6b (diff) | |
[PATCH] Remove smbfs server->rcls/err
This is a small cleanup requested by Urban, use the rcls/err in smb_request
as opposed to smb_sb_info.
Signed-off-by: Zwane Mwaikambo <zwane@linuxpower.ca>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | fs/smbfs/proc.c | 12 | ||||
| -rw-r--r-- | include/linux/smb_fs_sb.h | 3 |
2 files changed, 6 insertions, 9 deletions
diff --git a/fs/smbfs/proc.c b/fs/smbfs/proc.c index 21c90222bcb4..3d67e86dcde2 100644 --- a/fs/smbfs/proc.c +++ b/fs/smbfs/proc.c @@ -2370,7 +2370,7 @@ smb_proc_readdir_long(struct file *filp, void *dirent, filldir_t filldir, if (req->rq_rcls != 0) { result = smb_errno(req); PARANOIA("name=%s, result=%d, rcls=%d, err=%d\n", - mask, result, server->rcls, server->err); + mask, result, req->rq_rcls, req->rq_err); break; } @@ -2526,7 +2526,7 @@ smb_proc_getattr_ff(struct smb_sb_info *server, struct dentry *dentry, result = smb_add_request(req); if (result < 0) goto out_free; - if (server->rcls != 0) { + if (req->rq_rcls != 0) { result = smb_errno(req); #ifdef SMBFS_PARANOIA if (result != -ENOENT) @@ -2639,7 +2639,7 @@ smb_proc_getattr_trans2(struct smb_sb_info *server, struct dentry *dir, result = smb_add_request(req); if (result < 0) goto out; - if (server->rcls != 0) { + if (req->rq_rcls != 0) { VERBOSE("for %s: result=%d, rcls=%d, err=%d\n", ¶m[6], result, req->rq_rcls, req->rq_err); result = smb_errno(req); @@ -3218,7 +3218,7 @@ smb_proc_read_link(struct smb_sb_info *server, struct dentry *d, if (result < 0) goto out_free; DEBUG1("for %s: result=%d, rcls=%d, err=%d\n", - ¶m[6], result, server->rcls, server->err); + ¶m[6], result, req->rq_rcls, req->rq_err); /* copy data up to the \0 or buffer length */ result = len; @@ -3268,7 +3268,7 @@ smb_proc_symlink(struct smb_sb_info *server, struct dentry *d, goto out_free; DEBUG1("for %s: result=%d, rcls=%d, err=%d\n", - ¶m[6], result, server->rcls, server->err); + ¶m[6], result, req->rq_rcls, req->rq_err); result = 0; out_free: @@ -3315,7 +3315,7 @@ smb_proc_link(struct smb_sb_info *server, struct dentry *dentry, goto out_free; DEBUG1("for %s: result=%d, rcls=%d, err=%d\n", - ¶m[6], result, server->rcls, server->err); + ¶m[6], result, req->rq_rcls, req->rq_err); result = 0; out_free: diff --git a/include/linux/smb_fs_sb.h b/include/linux/smb_fs_sb.h index f2400292dbbb..976332af7949 100644 --- a/include/linux/smb_fs_sb.h +++ b/include/linux/smb_fs_sb.h @@ -60,9 +60,6 @@ struct smb_sb_info { struct semaphore sem; - unsigned short rcls; /* The error codes we received */ - unsigned short err; - unsigned char header[SMB_HEADER_LEN + 20*2 + 2]; u32 header_len; u32 smb_len; |