diff options
Diffstat (limited to 'fs/cifs/cifsfs.c')
-rw-r--r-- | fs/cifs/cifsfs.c | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index ded66be6597c..53e794131c2a 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
@@ -128,8 +128,7 @@ cifs_read_super(struct super_block *sb, void *data, | |||
128 | 128 | ||
129 | if (rc) { | 129 | if (rc) { |
130 | if (!silent) | 130 | if (!silent) |
131 | cERROR(1, | 131 | cERROR(1, "cifs_mount failed w/return code = %d", rc); |
132 | ("cifs_mount failed w/return code = %d", rc)); | ||
133 | goto out_mount_failed; | 132 | goto out_mount_failed; |
134 | } | 133 | } |
135 | 134 | ||
@@ -160,7 +159,7 @@ cifs_read_super(struct super_block *sb, void *data, | |||
160 | 159 | ||
161 | #ifdef CONFIG_CIFS_EXPERIMENTAL | 160 | #ifdef CONFIG_CIFS_EXPERIMENTAL |
162 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) { | 161 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) { |
163 | cFYI(1, ("export ops supported")); | 162 | cFYI(1, "export ops supported"); |
164 | sb->s_export_op = &cifs_export_ops; | 163 | sb->s_export_op = &cifs_export_ops; |
165 | } | 164 | } |
166 | #endif /* EXPERIMENTAL */ | 165 | #endif /* EXPERIMENTAL */ |
@@ -168,7 +167,7 @@ cifs_read_super(struct super_block *sb, void *data, | |||
168 | return 0; | 167 | return 0; |
169 | 168 | ||
170 | out_no_root: | 169 | out_no_root: |
171 | cERROR(1, ("cifs_read_super: get root inode failed")); | 170 | cERROR(1, "cifs_read_super: get root inode failed"); |
172 | if (inode) | 171 | if (inode) |
173 | iput(inode); | 172 | iput(inode); |
174 | 173 | ||
@@ -194,10 +193,10 @@ cifs_put_super(struct super_block *sb) | |||
194 | int rc = 0; | 193 | int rc = 0; |
195 | struct cifs_sb_info *cifs_sb; | 194 | struct cifs_sb_info *cifs_sb; |
196 | 195 | ||
197 | cFYI(1, ("In cifs_put_super")); | 196 | cFYI(1, "In cifs_put_super"); |
198 | cifs_sb = CIFS_SB(sb); | 197 | cifs_sb = CIFS_SB(sb); |
199 | if (cifs_sb == NULL) { | 198 | if (cifs_sb == NULL) { |
200 | cFYI(1, ("Empty cifs superblock info passed to unmount")); | 199 | cFYI(1, "Empty cifs superblock info passed to unmount"); |
201 | return; | 200 | return; |
202 | } | 201 | } |
203 | 202 | ||
@@ -205,7 +204,7 @@ cifs_put_super(struct super_block *sb) | |||
205 | 204 | ||
206 | rc = cifs_umount(sb, cifs_sb); | 205 | rc = cifs_umount(sb, cifs_sb); |
207 | if (rc) | 206 | if (rc) |
208 | cERROR(1, ("cifs_umount failed with return code %d", rc)); | 207 | cERROR(1, "cifs_umount failed with return code %d", rc); |
209 | #ifdef CONFIG_CIFS_DFS_UPCALL | 208 | #ifdef CONFIG_CIFS_DFS_UPCALL |
210 | if (cifs_sb->mountdata) { | 209 | if (cifs_sb->mountdata) { |
211 | kfree(cifs_sb->mountdata); | 210 | kfree(cifs_sb->mountdata); |
@@ -439,7 +438,7 @@ int cifs_xquota_set(struct super_block *sb, int quota_type, qid_t qid, | |||
439 | 438 | ||
440 | xid = GetXid(); | 439 | xid = GetXid(); |
441 | if (pTcon) { | 440 | if (pTcon) { |
442 | cFYI(1, ("set type: 0x%x id: %d", quota_type, qid)); | 441 | cFYI(1, "set type: 0x%x id: %d", quota_type, qid); |
443 | } else | 442 | } else |
444 | rc = -EIO; | 443 | rc = -EIO; |
445 | 444 | ||
@@ -462,7 +461,7 @@ int cifs_xquota_get(struct super_block *sb, int quota_type, qid_t qid, | |||
462 | 461 | ||
463 | xid = GetXid(); | 462 | xid = GetXid(); |
464 | if (pTcon) { | 463 | if (pTcon) { |
465 | cFYI(1, ("set type: 0x%x id: %d", quota_type, qid)); | 464 | cFYI(1, "set type: 0x%x id: %d", quota_type, qid); |
466 | } else | 465 | } else |
467 | rc = -EIO; | 466 | rc = -EIO; |
468 | 467 | ||
@@ -484,7 +483,7 @@ int cifs_xstate_set(struct super_block *sb, unsigned int flags, int operation) | |||
484 | 483 | ||
485 | xid = GetXid(); | 484 | xid = GetXid(); |
486 | if (pTcon) { | 485 | if (pTcon) { |
487 | cFYI(1, ("flags: 0x%x operation: 0x%x", flags, operation)); | 486 | cFYI(1, "flags: 0x%x operation: 0x%x", flags, operation); |
488 | } else | 487 | } else |
489 | rc = -EIO; | 488 | rc = -EIO; |
490 | 489 | ||
@@ -506,7 +505,7 @@ int cifs_xstate_get(struct super_block *sb, struct fs_quota_stat *qstats) | |||
506 | 505 | ||
507 | xid = GetXid(); | 506 | xid = GetXid(); |
508 | if (pTcon) { | 507 | if (pTcon) { |
509 | cFYI(1, ("pqstats %p", qstats)); | 508 | cFYI(1, "pqstats %p", qstats); |
510 | } else | 509 | } else |
511 | rc = -EIO; | 510 | rc = -EIO; |
512 | 511 | ||
@@ -548,7 +547,7 @@ static void cifs_umount_begin(struct super_block *sb) | |||
548 | /* cancel_brl_requests(tcon); */ /* BB mark all brl mids as exiting */ | 547 | /* cancel_brl_requests(tcon); */ /* BB mark all brl mids as exiting */ |
549 | /* cancel_notify_requests(tcon); */ | 548 | /* cancel_notify_requests(tcon); */ |
550 | if (tcon->ses && tcon->ses->server) { | 549 | if (tcon->ses && tcon->ses->server) { |
551 | cFYI(1, ("wake up tasks now - umount begin not complete")); | 550 | cFYI(1, "wake up tasks now - umount begin not complete"); |
552 | wake_up_all(&tcon->ses->server->request_q); | 551 | wake_up_all(&tcon->ses->server->request_q); |
553 | wake_up_all(&tcon->ses->server->response_q); | 552 | wake_up_all(&tcon->ses->server->response_q); |
554 | msleep(1); /* yield */ | 553 | msleep(1); /* yield */ |
@@ -599,7 +598,7 @@ cifs_get_sb(struct file_system_type *fs_type, | |||
599 | int rc; | 598 | int rc; |
600 | struct super_block *sb = sget(fs_type, NULL, set_anon_super, NULL); | 599 | struct super_block *sb = sget(fs_type, NULL, set_anon_super, NULL); |
601 | 600 | ||
602 | cFYI(1, ("Devname: %s flags: %d ", dev_name, flags)); | 601 | cFYI(1, "Devname: %s flags: %d ", dev_name, flags); |
603 | 602 | ||
604 | if (IS_ERR(sb)) | 603 | if (IS_ERR(sb)) |
605 | return PTR_ERR(sb); | 604 | return PTR_ERR(sb); |
@@ -868,7 +867,7 @@ cifs_init_request_bufs(void) | |||
868 | } else { | 867 | } else { |
869 | CIFSMaxBufSize &= 0x1FE00; /* Round size to even 512 byte mult*/ | 868 | CIFSMaxBufSize &= 0x1FE00; /* Round size to even 512 byte mult*/ |
870 | } | 869 | } |
871 | /* cERROR(1,("CIFSMaxBufSize %d 0x%x",CIFSMaxBufSize,CIFSMaxBufSize)); */ | 870 | /* cERROR(1, "CIFSMaxBufSize %d 0x%x",CIFSMaxBufSize,CIFSMaxBufSize); */ |
872 | cifs_req_cachep = kmem_cache_create("cifs_request", | 871 | cifs_req_cachep = kmem_cache_create("cifs_request", |
873 | CIFSMaxBufSize + | 872 | CIFSMaxBufSize + |
874 | MAX_CIFS_HDR_SIZE, 0, | 873 | MAX_CIFS_HDR_SIZE, 0, |
@@ -880,7 +879,7 @@ cifs_init_request_bufs(void) | |||
880 | cifs_min_rcv = 1; | 879 | cifs_min_rcv = 1; |
881 | else if (cifs_min_rcv > 64) { | 880 | else if (cifs_min_rcv > 64) { |
882 | cifs_min_rcv = 64; | 881 | cifs_min_rcv = 64; |
883 | cERROR(1, ("cifs_min_rcv set to maximum (64)")); | 882 | cERROR(1, "cifs_min_rcv set to maximum (64)"); |
884 | } | 883 | } |
885 | 884 | ||
886 | cifs_req_poolp = mempool_create_slab_pool(cifs_min_rcv, | 885 | cifs_req_poolp = mempool_create_slab_pool(cifs_min_rcv, |
@@ -911,7 +910,7 @@ cifs_init_request_bufs(void) | |||
911 | cifs_min_small = 2; | 910 | cifs_min_small = 2; |
912 | else if (cifs_min_small > 256) { | 911 | else if (cifs_min_small > 256) { |
913 | cifs_min_small = 256; | 912 | cifs_min_small = 256; |
914 | cFYI(1, ("cifs_min_small set to maximum (256)")); | 913 | cFYI(1, "cifs_min_small set to maximum (256)"); |
915 | } | 914 | } |
916 | 915 | ||
917 | cifs_sm_req_poolp = mempool_create_slab_pool(cifs_min_small, | 916 | cifs_sm_req_poolp = mempool_create_slab_pool(cifs_min_small, |
@@ -1009,10 +1008,10 @@ init_cifs(void) | |||
1009 | 1008 | ||
1010 | if (cifs_max_pending < 2) { | 1009 | if (cifs_max_pending < 2) { |
1011 | cifs_max_pending = 2; | 1010 | cifs_max_pending = 2; |
1012 | cFYI(1, ("cifs_max_pending set to min of 2")); | 1011 | cFYI(1, "cifs_max_pending set to min of 2"); |
1013 | } else if (cifs_max_pending > 256) { | 1012 | } else if (cifs_max_pending > 256) { |
1014 | cifs_max_pending = 256; | 1013 | cifs_max_pending = 256; |
1015 | cFYI(1, ("cifs_max_pending set to max of 256")); | 1014 | cFYI(1, "cifs_max_pending set to max of 256"); |
1016 | } | 1015 | } |
1017 | 1016 | ||
1018 | rc = cifs_init_inodecache(); | 1017 | rc = cifs_init_inodecache(); |
@@ -1070,7 +1069,7 @@ init_cifs(void) | |||
1070 | static void __exit | 1069 | static void __exit |
1071 | exit_cifs(void) | 1070 | exit_cifs(void) |
1072 | { | 1071 | { |
1073 | cFYI(DBG2, ("exit_cifs")); | 1072 | cFYI(DBG2, "exit_cifs"); |
1074 | cifs_proc_clean(); | 1073 | cifs_proc_clean(); |
1075 | #ifdef CONFIG_CIFS_DFS_UPCALL | 1074 | #ifdef CONFIG_CIFS_DFS_UPCALL |
1076 | cifs_dfs_release_automount_timer(); | 1075 | cifs_dfs_release_automount_timer(); |