| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 24 Sep 2008 17:14:39 +0900
From: Takashi Sato <t-sato@...jp.nec.com>
To: Dave Chinner <david@...morbit.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
Christoph Hellwig <hch@...radead.org>,
"linux-fsdevel@...r.kernel.org" <linux-fsdevel@...r.kernel.org>,
"dm-devel@...hat.com" <dm-devel@...hat.com>,
"viro@...IV.linux.org.uk" <viro@...IV.linux.org.uk>,
"linux-ext4@...r.kernel.org" <linux-ext4@...r.kernel.org>,
"xfs@....sgi.com" <xfs@....sgi.com>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 4/10] xfs: Fix error handling inwrite_super_lockfs/unlockfs
Hi,
Dave Chinner wrote:
>> diff -uprN -X linux-2.6.27-rc7-lockfs/Documentation/dontdiff linux-2.6.27-rc7-lockfs/fs/xfs/linux-2.6/xfs_super.c lin
ux-
>> 2.6.27-rc7-lockfs-xfs/fs/xfs/linux-2.6/xfs_super.c
>> --- linux-2.6.27-rc7-lockfs/fs/xfs/linux-2.6/xfs_super.c 2008-09-22 07:29:55.000000000 +0900
>> +++ linux-2.6.27-rc7-lockfs-xfs/fs/xfs/linux-2.6/xfs_super.c 2008-09-22 10:13:39.000000000 +0900
>> @@ -1351,7 +1351,7 @@ xfs_fs_remount(
>> * need to take care of themetadata. Once that's done write a dummy
>> * record to dirty the log in case of a crash while frozen.
>> */
>> -STATIC void
>> +STATIC int
>> xfs_fs_lockfs(
>> struct super_block *sb)
>> {
>> @@ -1359,6 +1359,7 @@ xfs_fs_lockfs(
>>
>> xfs_attr_quiesce(mp);
>> xfs_fs_log_dummy(mp);
>> + return 0;
>> }
>
> xfs_fs_log_dummy() currently is void because it had nowhere to
> return errors to. It silently throws away errors because of this.
> Hence the correct thing to do here is to fix xfs_fs_log_dummy()
> to return the errors it currently ignores. i.e. catch the errors
> from xfs_trans_reserve() and xfs_trans_commit() calls in
> xfs_fs_log_dummy().
OK.
I've fixed the patch for xfs as following.
Could you review it?
If it's OK, I will include it in new freeze patch-set.
Signed-off-by: Takashi Sato <t-sato@...jp.nec.com>
Signed-off-by: Masayuki Hamaguchi <m-hamaguchi@...jp.nec.com>
---
diff -uprN -X linux-2.6.27-rc7.org/Documentation/dontdiff linux-2.6.27-rc7-ext4_3/fs/xfs/linux-2.6/xfs_super.c linux-2.6
.27-rc7-xfs_4/fs/xfs/linux-2.6/xfs_super.c
--- linux-2.6.27-rc7-ext4_3/fs/xfs/linux-2.6/xfs_super.c 2008-09-24 10:48:02.000000000 +0900
+++ linux-2.6.27-rc7-xfs_4/fs/xfs/linux-2.6/xfs_super.c 2008-09-24 11:24:08.000000000 +0900
@@ -1351,14 +1351,14 @@ xfs_fs_remount(
* need to take care of themetadata. Once that's done write a dummy
* record to dirty the log in case of a crash while frozen.
*/
-STATIC void
+STATIC int
xfs_fs_lockfs(
struct super_block *sb)
{
struct xfs_mount *mp = XFS_M(sb);
xfs_attr_quiesce(mp);
- xfs_fs_log_dummy(mp);
+ return -xfs_fs_log_dummy(mp);
}
STATIC int
diff -uprN -X linux-2.6.27-rc7.org/Documentation/dontdiff linux-2.6.27-rc7-ext4_3/fs/xfs/xfs_fsops.c linux-2.6.27-rc7-xf
s_4/fs/xfs/xfs_fsops.c
--- linux-2.6.27-rc7-ext4_3/fs/xfs/xfs_fsops.c 2008-09-24 10:48:02.000000000 +0900
+++ linux-2.6.27-rc7-xfs_4/fs/xfs/xfs_fsops.c 2008-09-24 11:47:08.000000000 +0900
@@ -589,17 +589,19 @@ out:
return 0;
}
-void
+int
xfs_fs_log_dummy(
xfs_mount_t *mp)
{
xfs_trans_t *tp;
xfs_inode_t *ip;
+ int error;
tp = _xfs_trans_alloc(mp, XFS_TRANS_DUMMY1);
- if (xfs_trans_reserve(tp, 0, XFS_ICHANGE_LOG_RES(mp), 0, 0, 0)) {
+ error = xfs_trans_reserve(tp, 0, XFS_ICHANGE_LOG_RES(mp), 0, 0, 0);
+ if (error) {
xfs_trans_cancel(tp, 0);
- return;
+ return error;
}
ip = mp->m_rootip;
@@ -609,9 +611,10 @@ xfs_fs_log_dummy(
xfs_trans_ihold(tp, ip);
xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
xfs_trans_set_sync(tp);
- xfs_trans_commit(tp, 0);
+ error = xfs_trans_commit(tp, 0);
xfs_iunlock(ip, XFS_ILOCK_EXCL);
+ return error;
}
int
diff -uprN -X linux-2.6.27-rc7.org/Documentation/dontdiff linux-2.6.27-rc7-ext4_3/fs/xfs/xfs_fsops.h linux-2.6.27-rc7-xf
s_4/fs/xfs/xfs_fsops.h
--- linux-2.6.27-rc7-ext4_3/fs/xfs/xfs_fsops.h 2008-09-24 10:48:02.000000000 +0900
+++ linux-2.6.27-rc7-xfs_4/fs/xfs/xfs_fsops.h 2008-09-24 11:36:29.000000000 +0900
@@ -25,6 +25,6 @@ extern int xfs_fs_counts(xfs_mount_t *mp
extern int xfs_reserve_blocks(xfs_mount_t *mp, __uint64_t *inval,
xfs_fsop_resblks_t *outval);
extern int xfs_fs_goingdown(xfs_mount_t *mp, __uint32_t inflags);
-extern void xfs_fs_log_dummy(xfs_mount_t *mp);
+extern int xfs_fs_log_dummy(xfs_mount_t *mp);
#endif /* __XFS_FSOPS_H__ */
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists