---

yaml --- r: 377673 b: refs/heads/master c: 77888c1 h: refs/heads/master i: 377671: bdf3099 v: v3
git-mirror · May 28, 2013 · 37c82e3 · 37c82e3
1 parent 8f64e79
commit 37c82e3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f85b3520325a67ee4ac33e75bbcdbc25c79ce69
+refs/heads/master: 77888c1e42e8c76e16204cd99c19a01829421402
diff --git a/trunk/fs/f2fs/f2fs.h b/trunk/fs/f2fs/f2fs.h
@@ -887,6 +887,11 @@ static inline int cond_clear_inode_flag(struct f2fs_inode_info *fi, int flag)
 	return 0;
 }
 
+static inline int f2fs_readonly(struct super_block *sb)
+{
+	return sb->s_flags & MS_RDONLY;
+}
+
 /*
  * file.c
  */

diff --git a/trunk/fs/f2fs/file.c b/trunk/fs/f2fs/file.c
@@ -114,7 +114,7 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
 		.for_reclaim = 0,
 	};
 
-	if (inode->i_sb->s_flags & MS_RDONLY)
+	if (f2fs_readonly(inode->i_sb))
 		return 0;
 
 	trace_f2fs_sync_file_enter(inode);

diff --git a/trunk/fs/f2fs/super.c b/trunk/fs/f2fs/super.c
@@ -170,7 +170,7 @@ static int f2fs_freeze(struct super_block *sb)
 {
 	int err;
 
-	if (sb->s_flags & MS_RDONLY)
+	if (f2fs_readonly(sb))
 		return 0;
 
 	err = f2fs_sync_fs(sb, 1);