GFS2: Pull request (fixes)
Hi,
Please consider pulling the following fix,
Steve.
------------------------------------------------------------------------
The following changes since commit 64f1607ffbbc772685733ea63e6f7f4183df1b16:
Linus Torvalds (1):
Linux 2.6.31-rc6
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes.git master
Steven Whitehouse (1):
GFS2: Fix permissions on "recover" file
fs/gfs2/sys.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)
---------------------------------------------------------------------------
From d7e623da1a757fbd8c117fa29190ca8bef14dab3 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <[email protected]>
Date: Tue, 11 Aug 2009 11:20:11 +0100
Subject: [PATCH] GFS2: Fix permissions on "recover" file
Although this file is only ever written and not read by userspace, it seems that the utils are opening this file O_RDWR, so we need to allow that.
Also fixes the whitespace which seemed to be broken.
--- fs/gfs2/sys.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)
fs/gfs2/sys.c +10 -10
@@ -386,16 +386,16 @@ static ssize_t jid_show(struct gfs2_sbd *sdp, char *buf)#define GDLM_ATTR (_name,_mode,_show,_store) \ static struct gfs2_attr gdlm_attr_##_name = __ATTR(_name,_mode,_show,_store) -GDLM_ATTR (proto_name,0444 , proto_name_show,NULL ); -GDLM_ATTR (block,0644 , block_show, block_store); -GDLM_ATTR (withdraw,0644 , withdraw_show, withdraw_store); -GDLM_ATTR (id,0444 , lkid_show,NULL ); -GDLM_ATTR (jid,0444 , jid_show,NULL ); -GDLM_ATTR (first,0444 , lkfirst_show,NULL ); -GDLM_ATTR (first_done,0444 , first_done_show,NULL ); -GDLM_ATTR (recover,0200 ,NULL , recover_store); -GDLM_ATTR (recover_done,0444 , recover_done_show,NULL ); -GDLM_ATTR (recover_status,0444 , recover_status_show,NULL ); +GDLM_ATTR (proto_name,0444 , proto_name_show,NULL ); +GDLM_ATTR (block,0644 , block_show, block_store); +GDLM_ATTR (withdraw,0644 , withdraw_show, withdraw_store); +GDLM_ATTR (id,0444 , lkid_show,NULL ); +GDLM_ATTR (jid,0444 , jid_show,NULL ); +GDLM_ATTR (first,0444 , lkfirst_show,NULL ); +GDLM_ATTR (first_done,0444 , first_done_show,NULL ); +GDLM_ATTR (recover,0600 ,NULL , recover_store); +GDLM_ATTR (recover_done,0444 , recover_done_show,NULL ); +GDLM_ATTR (recover_status,0444 , recover_status_show,NULL );static struct attribute *lock_module_attrs[] = { &gdlm_attr_proto_name.attr,
Signature · 1 line
1.6.2.5