From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gu Zheng Subject: [f2fs-dev] [PATCH] f2fs: Remove the second argument "sbi" of func parse_options() Date: Tue, 11 Jun 2013 10:17:24 +0800 Message-ID: <51B688B4.90802@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1UmEoy-0007mj-1c for linux-f2fs-devel@lists.sourceforge.net; Tue, 11 Jun 2013 03:00:32 +0000 Received: from [222.73.24.84] (helo=song.cn.fujitsu.com) by sog-mx-2.v43.ch3.sourceforge.com with esmtp (Exim 4.76) id 1UmEow-0007UH-9u for linux-f2fs-devel@lists.sourceforge.net; Tue, 11 Jun 2013 03:00:32 +0000 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net To: jaegeuk.kim@samsung.com Cc: guz.fnst@cn.fujitsu.com, linux-kernel , linux-f2fs-devel@lists.sourceforge.net V2UgY2FuIGdldCBmMmZzX3NiX2luZm8gdmlhIEYyRlNfU0Ioc2Ip77yMc28gcmVtb3ZlIHRoZSBz ZWNvbmQgYXJndW1lbnQgInNiaSIgb2YgZnVuYyBwYXJzZV9vcHRpb25zKCkuCmYyZnNfZmlsbF9z dXBlcigpLCBhcyB0aGUgb25seSB1c2VyIG9mIHBhcnNlX29wdGlvbnMoKSBub3csIHNldHRpbmcg c2ItPnNfZnNfaW5mbyA9IHNiaSBiZWZvcmUgY2FsbGluZwpwYXJzZV9vcHRpb25zKCkuCgpTaWdu ZWQtb2ZmLWJ5OiBHdSBaaGVuZyA8Z3V6LmZuc3RAY24uZnVqaXRzdS5jb20+Ci0tLQogZnMvZjJm cy9zdXBlci5jIHwgICAgOCArKysrLS0tLQogMSBmaWxlcyBjaGFuZ2VkLCA0IGluc2VydGlvbnMo KyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZnMvZjJmcy9zdXBlci5jIGIvZnMvZjJm cy9zdXBlci5jCmluZGV4IDg1NTVmN2QuLjU4NTE2YjUgMTAwNjQ0Ci0tLSBhL2ZzL2YyZnMvc3Vw ZXIuYworKysgYi9mcy9mMmZzL3N1cGVyLmMKQEAgLTMwMyw5ICszMDMsOSBAQCBzdGF0aWMgY29u c3Qgc3RydWN0IGV4cG9ydF9vcGVyYXRpb25zIGYyZnNfZXhwb3J0X29wcyA9IHsKIAkuZ2V0X3Bh cmVudCA9IGYyZnNfZ2V0X3BhcmVudCwKIH07CiAKLXN0YXRpYyBpbnQgcGFyc2Vfb3B0aW9ucyhz dHJ1Y3Qgc3VwZXJfYmxvY2sgKnNiLCBzdHJ1Y3QgZjJmc19zYl9pbmZvICpzYmksCi0JCQkJY2hh ciAqb3B0aW9ucykKK3N0YXRpYyBpbnQgcGFyc2Vfb3B0aW9ucyhzdHJ1Y3Qgc3VwZXJfYmxvY2sg KnNiLCBjaGFyICpvcHRpb25zKQogeworCXN0cnVjdCBmMmZzX3NiX2luZm8gKnNiaSA9IEYyRlNf U0Ioc2IpOwogCXN1YnN0cmluZ190IGFyZ3NbTUFYX09QVF9BUkdTXTsKIAljaGFyICpwOwogCWlu dCBhcmcgPSAwOwpAQCAtNTQxLDYgKzU0MSw3IEBAIHN0YXRpYyBpbnQgZjJmc19maWxsX3N1cGVy KHN0cnVjdCBzdXBlcl9ibG9jayAqc2IsIHZvaWQgKmRhdGEsIGludCBzaWxlbnQpCiAJCWlmIChl cnIpCiAJCQlnb3RvIGZyZWVfc2JfYnVmOwogCX0KKwlzYi0+c19mc19pbmZvID0gc2JpOwogCS8q IGluaXQgc29tZSBGUyBwYXJhbWV0ZXJzICovCiAJc2JpLT5hY3RpdmVfbG9ncyA9IE5SX0NVUlNF R19UWVBFOwogCkBAIC01NTMsNyArNTU0LDcgQEAgc3RhdGljIGludCBmMmZzX2ZpbGxfc3VwZXIo c3RydWN0IHN1cGVyX2Jsb2NrICpzYiwgdm9pZCAqZGF0YSwgaW50IHNpbGVudCkKIAlzZXRfb3B0 KHNiaSwgUE9TSVhfQUNMKTsKICNlbmRpZgogCS8qIHBhcnNlIG1vdW50IG9wdGlvbnMgKi8KLQll cnIgPSBwYXJzZV9vcHRpb25zKHNiLCBzYmksIChjaGFyICopZGF0YSk7CisJZXJyID0gcGFyc2Vf b3B0aW9ucyhzYiwgKGNoYXIgKilkYXRhKTsKIAlpZiAoZXJyKQogCQlnb3RvIGZyZWVfc2JfYnVm OwogCkBAIC01NjUsNyArNTY2LDYgQEAgc3RhdGljIGludCBmMmZzX2ZpbGxfc3VwZXIoc3RydWN0 IHN1cGVyX2Jsb2NrICpzYiwgdm9pZCAqZGF0YSwgaW50IHNpbGVudCkKIAlzYi0+c194YXR0ciA9 IGYyZnNfeGF0dHJfaGFuZGxlcnM7CiAJc2ItPnNfZXhwb3J0X29wID0gJmYyZnNfZXhwb3J0X29w czsKIAlzYi0+c19tYWdpYyA9IEYyRlNfU1VQRVJfTUFHSUM7Ci0Jc2ItPnNfZnNfaW5mbyA9IHNi aTsKIAlzYi0+c190aW1lX2dyYW4gPSAxOwogCXNiLT5zX2ZsYWdzID0gKHNiLT5zX2ZsYWdzICYg fk1TX1BPU0lYQUNMKSB8CiAJCSh0ZXN0X29wdChzYmksIFBPU0lYX0FDTCkgPyBNU19QT1NJWEFD TCA6IDApOwotLSAKMS43LjcKLS0KVG8gdW5zdWJzY3JpYmUgZnJvbSB0aGlzIGxpc3Q6IHNlbmQg dGhlIGxpbmUgInVuc3Vic2NyaWJlIGxpbnV4LWtlcm5lbCIgaW4KdGhlIGJvZHkgb2YgYSBtZXNz YWdlIHRvIG1ham9yZG9tb0B2Z2VyLmtlcm5lbC5vcmcKTW9yZSBtYWpvcmRvbW8gaW5mbyBhdCAg aHR0cDovL3ZnZXIua2VybmVsLm9yZy9tYWpvcmRvbW8taW5mby5odG1sClBsZWFzZSByZWFkIHRo ZSBGQVEgYXQgIGh0dHA6Ly93d3cudHV4Lm9yZy9sa21sLwoKCi0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQpUaGlzIFNGLm5ldCBlbWFpbCBpcyBzcG9uc29yZWQgYnkgV2luZG93czoKCkJ1aWxkIGZvciBX aW5kb3dzIFN0b3JlLgoKaHR0cDovL3Auc2YubmV0L3NmdS93aW5kb3dzLWRldjJkZXYKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTGludXgtZjJmcy1kZXZl bCBtYWlsaW5nIGxpc3QKTGludXgtZjJmcy1kZXZlbEBsaXN0cy5zb3VyY2Vmb3JnZS5uZXQKaHR0 cHM6Ly9saXN0cy5zb3VyY2Vmb3JnZS5uZXQvbGlzdHMvbGlzdGluZm8vbGludXgtZjJmcy1kZXZl bAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753678Ab3FKDAY (ORCPT ); Mon, 10 Jun 2013 23:00:24 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:29238 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751638Ab3FKDAX convert rfc822-to-8bit (ORCPT ); Mon, 10 Jun 2013 23:00:23 -0400 X-IronPort-AV: E=Sophos;i="4.87,841,1363104000"; d="scan'208";a="7517301" Message-ID: <51B688B4.90802@cn.fujitsu.com> Date: Tue, 11 Jun 2013 10:17:24 +0800 From: Gu Zheng User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:7.0.1) Gecko/20110930 Thunderbird/7.0.1 MIME-Version: 1.0 To: jaegeuk.kim@samsung.com CC: linux-f2fs-devel@lists.sourceforge.net, linux-kernel , guz.fnst@cn.fujitsu.com Subject: [PATCH] f2fs: Remove the second argument "sbi" of func parse_options() X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/06/11 10:18:17, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/06/11 10:18:26 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We can get f2fs_sb_info via F2FS_SB(sb)，so remove the second argument "sbi" of func parse_options(). f2fs_fill_super(), as the only user of parse_options() now, setting sb->s_fs_info = sbi before calling parse_options(). Signed-off-by: Gu Zheng --- fs/f2fs/super.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 8555f7d..58516b5 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -303,9 +303,9 @@ static const struct export_operations f2fs_export_ops = { .get_parent = f2fs_get_parent, }; -static int parse_options(struct super_block *sb, struct f2fs_sb_info *sbi, - char *options) +static int parse_options(struct super_block *sb, char *options) { + struct f2fs_sb_info *sbi = F2FS_SB(sb); substring_t args[MAX_OPT_ARGS]; char *p; int arg = 0; @@ -541,6 +541,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) if (err) goto free_sb_buf; } + sb->s_fs_info = sbi; /* init some FS parameters */ sbi->active_logs = NR_CURSEG_TYPE; @@ -553,7 +554,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) set_opt(sbi, POSIX_ACL); #endif /* parse mount options */ - err = parse_options(sb, sbi, (char *)data); + err = parse_options(sb, (char *)data); if (err) goto free_sb_buf; @@ -565,7 +566,6 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) sb->s_xattr = f2fs_xattr_handlers; sb->s_export_op = &f2fs_export_ops; sb->s_magic = F2FS_SUPER_MAGIC; - sb->s_fs_info = sbi; sb->s_time_gran = 1; sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sbi, POSIX_ACL) ? MS_POSIXACL : 0); -- 1.7.7 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/