aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifsfs.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/cifs/cifsfs.c')
-rw-r--r--fs/cifs/cifsfs.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 2493cc4f9e7f..c7c3521aa7cd 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -240,9 +240,9 @@ static int cifs_permission(struct inode *inode, int mask, struct nameidata *nd)
240 240
241 cifs_sb = CIFS_SB(inode->i_sb); 241 cifs_sb = CIFS_SB(inode->i_sb);
242 242
243 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM) { 243 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM)
244 return 0; 244 return 0;
245 } else /* file mode might have been restricted at mount time 245 else /* file mode might have been restricted at mount time
246 on the client (above and beyond ACL on servers) for 246 on the client (above and beyond ACL on servers) for
247 servers which do not support setting and viewing mode bits, 247 servers which do not support setting and viewing mode bits,
248 so allowing client to check permissions is useful */ 248 so allowing client to check permissions is useful */
@@ -716,7 +716,7 @@ static int
716cifs_init_inodecache(void) 716cifs_init_inodecache(void)
717{ 717{
718 cifs_inode_cachep = kmem_cache_create("cifs_inode_cache", 718 cifs_inode_cachep = kmem_cache_create("cifs_inode_cache",
719 sizeof (struct cifsInodeInfo), 719 sizeof(struct cifsInodeInfo),
720 0, (SLAB_RECLAIM_ACCOUNT| 720 0, (SLAB_RECLAIM_ACCOUNT|
721 SLAB_MEM_SPREAD), 721 SLAB_MEM_SPREAD),
722 cifs_init_once); 722 cifs_init_once);
@@ -816,8 +816,8 @@ static int
816cifs_init_mids(void) 816cifs_init_mids(void)
817{ 817{
818 cifs_mid_cachep = kmem_cache_create("cifs_mpx_ids", 818 cifs_mid_cachep = kmem_cache_create("cifs_mpx_ids",
819 sizeof (struct mid_q_entry), 0, 819 sizeof(struct mid_q_entry), 0,
820 SLAB_HWCACHE_ALIGN, NULL); 820 SLAB_HWCACHE_ALIGN, NULL);
821 if (cifs_mid_cachep == NULL) 821 if (cifs_mid_cachep == NULL)
822 return -ENOMEM; 822 return -ENOMEM;
823 823
@@ -829,8 +829,8 @@ cifs_init_mids(void)
829 } 829 }
830 830
831 cifs_oplock_cachep = kmem_cache_create("cifs_oplock_structs", 831 cifs_oplock_cachep = kmem_cache_create("cifs_oplock_structs",
832 sizeof (struct oplock_q_entry), 0, 832 sizeof(struct oplock_q_entry), 0,
833 SLAB_HWCACHE_ALIGN, NULL); 833 SLAB_HWCACHE_ALIGN, NULL);
834 if (cifs_oplock_cachep == NULL) { 834 if (cifs_oplock_cachep == NULL) {
835 mempool_destroy(cifs_mid_poolp); 835 mempool_destroy(cifs_mid_poolp);
836 kmem_cache_destroy(cifs_mid_cachep); 836 kmem_cache_destroy(cifs_mid_cachep);
@@ -882,7 +882,8 @@ static int cifs_oplock_thread(void *dummyarg)
882 the call */ 882 the call */
883 /* mutex_lock(&inode->i_mutex);*/ 883 /* mutex_lock(&inode->i_mutex);*/
884 if (S_ISREG(inode->i_mode)) { 884 if (S_ISREG(inode->i_mode)) {
885 rc = filemap_fdatawrite(inode->i_mapping); 885 rc =
886 filemap_fdatawrite(inode->i_mapping);
886 if (CIFS_I(inode)->clientCanCacheRead 887 if (CIFS_I(inode)->clientCanCacheRead
887 == 0) { 888 == 0) {
888 filemap_fdatawait(inode->i_mapping); 889 filemap_fdatawait(inode->i_mapping);
@@ -907,8 +908,7 @@ static int cifs_oplock_thread(void *dummyarg)
907 0 /* len */ , 0 /* offset */, 0, 908 0 /* len */ , 0 /* offset */, 0,
908 0, LOCKING_ANDX_OPLOCK_RELEASE, 909 0, LOCKING_ANDX_OPLOCK_RELEASE,
909 0 /* wait flag */); 910 0 /* wait flag */);
910 cFYI(1, 911 cFYI(1, ("Oplock release rc = %d", rc));
911 ("Oplock release rc = %d ", rc));
912 } 912 }
913 } else 913 } else
914 spin_unlock(&GlobalMid_Lock); 914 spin_unlock(&GlobalMid_Lock);