diff options
Diffstat (limited to 'fs/cifs/misc.c')
-rw-r--r-- | fs/cifs/misc.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c index 7590fd3d958c..21a2c46334e1 100644 --- a/fs/cifs/misc.c +++ b/fs/cifs/misc.c | |||
@@ -47,8 +47,10 @@ _GetXid(void) | |||
47 | 47 | ||
48 | spin_lock(&GlobalMid_Lock); | 48 | spin_lock(&GlobalMid_Lock); |
49 | GlobalTotalActiveXid++; | 49 | GlobalTotalActiveXid++; |
50 | |||
51 | /* keep high water mark for number of simultaneous ops in filesystem */ | ||
50 | if (GlobalTotalActiveXid > GlobalMaxActiveXid) | 52 | if (GlobalTotalActiveXid > GlobalMaxActiveXid) |
51 | GlobalMaxActiveXid = GlobalTotalActiveXid; /* keep high water mark for number of simultaneous vfs ops in our filesystem */ | 53 | GlobalMaxActiveXid = GlobalTotalActiveXid; |
52 | if (GlobalTotalActiveXid > 65000) | 54 | if (GlobalTotalActiveXid > 65000) |
53 | cFYI(1, ("warning: more than 65000 requests active")); | 55 | cFYI(1, ("warning: more than 65000 requests active")); |
54 | xid = GlobalCurrentXid++; | 56 | xid = GlobalCurrentXid++; |
@@ -148,8 +150,8 @@ cifs_buf_get(void) | |||
148 | but it may be more efficient to always alloc same size | 150 | but it may be more efficient to always alloc same size |
149 | albeit slightly larger than necessary and maxbuffersize | 151 | albeit slightly larger than necessary and maxbuffersize |
150 | defaults to this and can not be bigger */ | 152 | defaults to this and can not be bigger */ |
151 | ret_buf = | 153 | ret_buf = (struct smb_hdr *) mempool_alloc(cifs_req_poolp, |
152 | (struct smb_hdr *) mempool_alloc(cifs_req_poolp, GFP_KERNEL | GFP_NOFS); | 154 | GFP_KERNEL | GFP_NOFS); |
153 | 155 | ||
154 | /* clear the first few header bytes */ | 156 | /* clear the first few header bytes */ |
155 | /* for most paths, more is cleared in header_assemble */ | 157 | /* for most paths, more is cleared in header_assemble */ |
@@ -187,8 +189,8 @@ cifs_small_buf_get(void) | |||
187 | but it may be more efficient to always alloc same size | 189 | but it may be more efficient to always alloc same size |
188 | albeit slightly larger than necessary and maxbuffersize | 190 | albeit slightly larger than necessary and maxbuffersize |
189 | defaults to this and can not be bigger */ | 191 | defaults to this and can not be bigger */ |
190 | ret_buf = | 192 | ret_buf = (struct smb_hdr *) mempool_alloc(cifs_sm_req_poolp, |
191 | (struct smb_hdr *) mempool_alloc(cifs_sm_req_poolp, GFP_KERNEL | GFP_NOFS); | 193 | GFP_KERNEL | GFP_NOFS); |
192 | if (ret_buf) { | 194 | if (ret_buf) { |
193 | /* No need to clear memory here, cleared in header assemble */ | 195 | /* No need to clear memory here, cleared in header assemble */ |
194 | /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/ | 196 | /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/ |