tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
GFS2: Fix permissions on "recover" file

Linus Torvalds 5d12dc1f 3011c7f0

+10 -10
unified split
+10 -10
fs/gfs2/sys.c
··· 386 #define GDLM_ATTR(_name,_mode,_show,_store) \ 387 static struct gfs2_attr gdlm_attr_##_name = __ATTR(_name,_mode,_show,_store) 388 389 - GDLM_ATTR(proto_name, 0444, proto_name_show, NULL); 390 - GDLM_ATTR(block, 0644, block_show, block_store); 391 - GDLM_ATTR(withdraw, 0644, withdraw_show, withdraw_store); 392 - GDLM_ATTR(id, 0444, lkid_show, NULL); 393 - GDLM_ATTR(jid, 0444, jid_show, NULL); 394 - GDLM_ATTR(first, 0444, lkfirst_show, NULL); 395 - GDLM_ATTR(first_done, 0444, first_done_show, NULL); 396 - GDLM_ATTR(recover, 0200, NULL, recover_store); 397 - GDLM_ATTR(recover_done, 0444, recover_done_show, NULL); 398 - GDLM_ATTR(recover_status, 0444, recover_status_show, NULL); 399 400 static struct attribute *lock_module_attrs[] = { 401 &gdlm_attr_proto_name.attr,
··· 386 #define GDLM_ATTR(_name,_mode,_show,_store) \ 387 static struct gfs2_attr gdlm_attr_##_name = __ATTR(_name,_mode,_show,_store) 388 389 + GDLM_ATTR(proto_name, 0444, proto_name_show, NULL); 390 + GDLM_ATTR(block, 0644, block_show, block_store); 391 + GDLM_ATTR(withdraw, 0644, withdraw_show, withdraw_store); 392 + GDLM_ATTR(id, 0444, lkid_show, NULL); 393 + GDLM_ATTR(jid, 0444, jid_show, NULL); 394 + GDLM_ATTR(first, 0444, lkfirst_show, NULL); 395 + GDLM_ATTR(first_done, 0444, first_done_show, NULL); 396 + GDLM_ATTR(recover, 0600, NULL, recover_store); 397 + GDLM_ATTR(recover_done, 0444, recover_done_show, NULL); 398 + GDLM_ATTR(recover_status, 0444, recover_status_show, NULL); 399 400 static struct attribute *lock_module_attrs[] = { 401 &gdlm_attr_proto_name.attr,