lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ocfs2: Bugfix for hard readonly mount

Browse Source 
ocfs2 cannot currently mount a device that is readonly at the media
("hard readonly").  Fix the broken places.
see detail: http://oss.oracle.com/bugzilla/show_bug.cgi?id=1322

[ Description edited -- Joel ]

Signed-off-by: Tiger Yang <tiger.yang@oracle.com>
Reviewed-by: Sunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Joel Becker <jlbec@evilplan.org>
This commit is contained in:
Tiger Yang
2011-05-28 00:34:19 +08:00
committed by Joel Becker
parent e12ca23d41
commit 03efed8a2a
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fs/ocfs2/dlmglue.c
View File

@@ -1692,7 +1692,7 @@ int ocfs2_open_lock(struct inode *inode)
mlog(0, "inode %llu take PRMODE open lock\n", mlog(0, "inode %llu take PRMODE open lock\n",
(unsigned long long)OCFS2_I(inode)->ip_blkno); (unsigned long long)OCFS2_I(inode)->ip_blkno);
if (ocfs2_mount_local(osb)) if (ocfs2_is_hard_readonly(osb) || ocfs2_mount_local(osb))
goto out; goto out;
lockres = &OCFS2_I(inode)->ip_open_lockres; lockres = &OCFS2_I(inode)->ip_open_lockres;
@@ -1718,6 +1718,12 @@ int ocfs2_try_open_lock(struct inode *inode, int write)
(unsigned long long)OCFS2_I(inode)->ip_blkno, (unsigned long long)OCFS2_I(inode)->ip_blkno,
write ? "EXMODE" : "PRMODE"); write ? "EXMODE" : "PRMODE");
if (ocfs2_is_hard_readonly(osb)) {
if (write)
status = -EROFS;
goto out;
}
if (ocfs2_mount_local(osb)) if (ocfs2_mount_local(osb))
goto out; goto out;
@@ -2298,7 +2304,7 @@ int ocfs2_inode_lock_full_nested(struct inode *inode,
if (ocfs2_is_hard_readonly(osb)) { if (ocfs2_is_hard_readonly(osb)) {
if (ex) if (ex)
status = -EROFS; status = -EROFS;
goto bail; goto getbh;
} }
if (ocfs2_mount_local(osb)) if (ocfs2_mount_local(osb))
@@ -2356,7 +2362,7 @@ local:
mlog_errno(status); mlog_errno(status);
goto bail; goto bail;
} }
getbh:
if (ret_bh) { if (ret_bh) {
status = ocfs2_assign_bh(inode, ret_bh, local_bh); status = ocfs2_assign_bh(inode, ret_bh, local_bh);
if (status < 0) { if (status < 0) {
@@ -2628,8 +2634,11 @@ int ocfs2_dentry_lock(struct dentry *dentry, int ex)
BUG_ON(!dl); BUG_ON(!dl);
if (ocfs2_is_hard_readonly(osb)) if (ocfs2_is_hard_readonly(osb)) {
if (ex)
return -EROFS; return -EROFS;
return 0;
}
if (ocfs2_mount_local(osb)) if (ocfs2_mount_local(osb))
return 0; return 0;
@@ -2647,7 +2656,7 @@ void ocfs2_dentry_unlock(struct dentry *dentry, int ex)
struct ocfs2_dentry_lock *dl = dentry->d_fsdata; struct ocfs2_dentry_lock *dl = dentry->d_fsdata;
struct ocfs2_super *osb = OCFS2_SB(dentry->d_sb); struct ocfs2_super *osb = OCFS2_SB(dentry->d_sb);
if (!ocfs2_mount_local(osb)) if (!ocfs2_is_hard_readonly(osb) && !ocfs2_mount_local(osb))
ocfs2_cluster_unlock(osb, &dl->dl_lockres, level); ocfs2_cluster_unlock(osb, &dl->dl_lockres, level);
} }

3
fs/ocfs2/super.c
View File

@@ -1974,7 +1974,8 @@ static void ocfs2_dismount_volume(struct super_block *sb, int mnt_err)
* If we failed before we got a uuid_str yet, we can't stop * If we failed before we got a uuid_str yet, we can't stop
* heartbeat. Otherwise, do it. * heartbeat. Otherwise, do it.
*/ */
if (!mnt_err && !ocfs2_mount_local(osb) && osb->uuid_str) if (!mnt_err && !ocfs2_mount_local(osb) && osb->uuid_str &&
!ocfs2_is_hard_readonly(osb))
hangup_needed = 1; hangup_needed = 1;
if (osb->cconn) if (osb->cconn)