Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d12dc1f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3011c7f0 d7e623da

fs/gfs2/sys.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -393,7 +393,7 @@ GDLM_ATTR(id, 0444, lkid_show, NULL); 
GDLM_ATTR(jid,			0444, jid_show,			NULL);

GDLM_ATTR(jid,			0444, jid_show,			NULL);

GDLM_ATTR(first,		0444, lkfirst_show,		NULL);

GDLM_ATTR(first,		0444, lkfirst_show,		NULL);

GDLM_ATTR(first_done,		0444, first_done_show,		NULL);

GDLM_ATTR(first_done,		0444, first_done_show,		NULL);

GDLM_ATTR(recover,        0200, NULL,			recover_store);

GDLM_ATTR(recover,		0600, NULL,			recover_store);

GDLM_ATTR(recover_done,		0444, recover_done_show,	NULL);

GDLM_ATTR(recover_done,		0444, recover_done_show,	NULL);

GDLM_ATTR(recover_status,	0444, recover_status_show,	NULL);

GDLM_ATTR(recover_status,	0444, recover_status_show,	NULL);