+1 -1

fs/ocfs2/cluster/sys.c

reviewed

··· 65 65 { 66 66 int ret; 67 67 68 68 - o2cb_kset = kset_create_and_add("o2cb", NULL, NULL); 68 68 + o2cb_kset = kset_create_and_add("o2cb", NULL, fs_kobj); 69 69 if (!o2cb_kset) 70 70 return -ENOMEM; 71 71

+5 -3

fs/ocfs2/dlm/dlmdebug.c

reviewed

··· 44 44 #define MLOG_MASK_PREFIX ML_DLM 45 45 #include "cluster/masklog.h" 46 46 47 47 - int stringify_lockname(const char *lockname, int locklen, char *buf, int len); 47 47 + static int stringify_lockname(const char *lockname, int locklen, char *buf, 48 48 + int len); 48 49 49 50 void dlm_print_one_lock_resource(struct dlm_lock_resource *res) 50 51 { ··· 252 251 * 253 252 * For more on lockname formats, please refer to dlmglue.c and ocfs2_lockid.h. 254 253 */ 255 255 - int stringify_lockname(const char *lockname, int locklen, char *buf, int len) 254 254 + static int stringify_lockname(const char *lockname, int locklen, char *buf, 255 255 + int len) 256 256 { 257 257 int out = 0; 258 258 __be64 inode_blkno_be; ··· 370 368 kfree(dc); 371 369 } 372 370 373 373 - void dlm_debug_put(struct dlm_debug_ctxt *dc) 371 371 + static void dlm_debug_put(struct dlm_debug_ctxt *dc) 374 372 { 375 373 if (dc) 376 374 kref_put(&dc->debug_refcnt, dlm_debug_free);

+4

fs/ocfs2/file.c

reviewed

··· 1048 1048 mlog_entry("(0x%p, '%.*s')\n", dentry, 1049 1049 dentry->d_name.len, dentry->d_name.name); 1050 1050 1051 1051 + /* ensuring we don't even attempt to truncate a symlink */ 1052 1052 + if (S_ISLNK(inode->i_mode)) 1053 1053 + attr->ia_valid &= ~ATTR_SIZE; 1054 1054 + 1051 1055 if (attr->ia_valid & ATTR_MODE) 1052 1056 mlog(0, "mode change: %d\n", attr->ia_mode); 1053 1057 if (attr->ia_valid & ATTR_UID)

+2 -2

fs/ocfs2/localalloc.c

reviewed

··· 260 260 bh = osb->local_alloc_bh; 261 261 alloc = (struct ocfs2_dinode *) bh->b_data; 262 262 263 263 - alloc_copy = kmalloc(bh->b_size, GFP_KERNEL); 263 263 + alloc_copy = kmalloc(bh->b_size, GFP_NOFS); 264 264 if (!alloc_copy) { 265 265 status = -ENOMEM; 266 266 goto out_commit; ··· 931 931 * local alloc shutdown won't try to double free main bitmap 932 932 * bits. Make a copy so the sync function knows which bits to 933 933 * free. */ 934 934 - alloc_copy = kmalloc(osb->local_alloc_bh->b_size, GFP_KERNEL); 934 934 + alloc_copy = kmalloc(osb->local_alloc_bh->b_size, GFP_NOFS); 935 935 if (!alloc_copy) { 936 936 status = -ENOMEM; 937 937 mlog_errno(status);

+1 -1

fs/ocfs2/stack_o2cb.c

reviewed

··· 385 385 return 0; 386 386 } 387 387 388 388 - struct ocfs2_stack_operations o2cb_stack_ops = { 388 388 + static struct ocfs2_stack_operations o2cb_stack_ops = { 389 389 .connect = o2cb_cluster_connect, 390 390 .disconnect = o2cb_cluster_disconnect, 391 391 .hangup = o2cb_cluster_hangup,

+1 -1

fs/ocfs2/stack_user.c

reviewed

··· 635 635 .owner = THIS_MODULE, 636 636 }; 637 637 638 638 - struct miscdevice ocfs2_control_device = { 638 638 + static struct miscdevice ocfs2_control_device = { 639 639 .minor = MISC_DYNAMIC_MINOR, 640 640 .name = "ocfs2_control", 641 641 .fops = &ocfs2_control_fops,

+2

fs/ocfs2/symlink.c

reviewed

··· 167 167 .readlink = page_readlink, 168 168 .follow_link = ocfs2_follow_link, 169 169 .getattr = ocfs2_getattr, 170 170 + .setattr = ocfs2_setattr, 170 171 }; 171 172 const struct inode_operations ocfs2_fast_symlink_inode_operations = { 172 173 .readlink = ocfs2_readlink, 173 174 .follow_link = ocfs2_follow_link, 174 175 .getattr = ocfs2_getattr, 176 176 + .setattr = ocfs2_setattr, 175 177 };