From: Bryan Schumaker <bjschuma@netapp.com>
To: Fred Isaman <faisaman4@gmail.com>
Cc: Trond.Myklebust@netapp.com, linux-nfs@vger.kernel.org
Subject: Re: [PATCH 01/10] NFS: Create a single nfs_fill_super() function
Date: Fri, 30 Mar 2012 16:08:48 -0400 [thread overview]
Message-ID: <4F7612D0.3070600@netapp.com> (raw)
In-Reply-To: <CADnza45POxTkb8zVYK_6UH2q_p5F-Eb2jko=VsjLD++VdD1GrQ@mail.gmail.com>
On 03/30/12 16:06, Fred Isaman wrote:
> On Fri, Mar 30, 2012 at 3:02 PM, <bjschuma@netapp.com> wrote:
>> From: Bryan Schumaker <bjschuma@netapp.com>
>>
>> This can be shared by v2, v3 and v4 in their other common code.
>>
>> Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
>> ---
>> fs/nfs/super.c | 26 ++++++--------------------
>> 1 file changed, 6 insertions(+), 20 deletions(-)
>>
>> diff --git a/fs/nfs/super.c b/fs/nfs/super.c
>> index 37412f7..c9bc86e 100644
>> --- a/fs/nfs/super.c
>> +++ b/fs/nfs/super.c
>> @@ -2135,16 +2135,18 @@ static void nfs_fill_super(struct super_block *sb,
>>
>> sb->s_blocksize_bits = 0;
>> sb->s_blocksize = 0;
>> - if (data->bsize)
>> + if (data && data->bsize)
>> sb->s_blocksize = nfs_block_size(data->bsize, &sb->s_blocksize_bits);
>>
>> - if (server->nfs_client->rpc_ops->version == 3) {
>> + if (server->nfs_client->rpc_ops->version != 2) {
>> /* The VFS shouldn't apply the umask to mode bits. We will do
>> * so ourselves when necessary.
>> */
>> sb->s_flags |= MS_POSIXACL;
>> sb->s_time_gran = 1;
>> }
>> + if (server->nfs_client->rpc_ops->version == 4)
>> + sb->s_xattr = nfs4_xattr_handlers;
>>
>> sb->s_op = &nfs_sops;
>> nfs_initialise_sb(sb);
>> @@ -2520,22 +2522,6 @@ static void nfs4_clone_super(struct super_block *sb,
>> nfs_initialise_sb(sb);
>> }
>>
>> -/*
>> - * Set up an NFS4 superblock
>> - */
>> -static void nfs4_fill_super(struct super_block *sb)
>> -{
>> - sb->s_time_gran = 1;
>> - sb->s_op = &nfs4_sops;
>
> This seems to discard nfs4_sops (with the accompanying nfs4_evict_inode).
Oops, I'll fix that... thanks for finding it!
- Bryan
>
> Fred
next prev parent reply other threads:[~2012-03-30 20:09 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-30 19:02 [PATCH 00/10] Clean up mount functions bjschuma
2012-03-30 19:02 ` [PATCH 01/10] NFS: Create a single nfs_fill_super() function bjschuma
2012-03-30 20:06 ` Fred Isaman
2012-03-30 20:08 ` Bryan Schumaker [this message]
2012-03-30 19:02 ` [PATCH 02/10] NFS: Create a single nfs_clone_super() function bjschuma
2012-03-30 19:02 ` [PATCH 03/10] NFS: Fix whitespace errors bjschuma
2012-03-30 19:02 ` [PATCH 04/10] NFS: Consistent arguments to nfs_fscache_get_super_cookie() bjschuma
2012-03-30 19:02 ` [PATCH 05/10] NFS: Rename nfs4_proc_get_root() bjschuma
2012-03-30 19:02 ` [PATCH 06/10] NFS: Create a single nfs_get_root() bjschuma
2012-03-30 19:02 ` [PATCH 07/10] NFS: Create a common fs_mount() function bjschuma
2012-03-30 19:02 ` [PATCH 08/10] NFS: Create a common xdev_mount() function bjschuma
2012-03-30 19:02 ` [PATCH 09/10] NFS: Use nfs_fs_mount_common() for xdev mounts bjschuma
2012-03-30 19:02 ` [PATCH 10/10] NFS: Use nfs_fs_mount_common() for remote referral mounts bjschuma
2012-03-30 20:51 ` [PATCH 00/10] Clean up mount functions Boaz Harrosh
2012-03-30 20:57 ` Myklebust, Trond
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F7612D0.3070600@netapp.com \
--to=bjschuma@netapp.com \
--cc=Trond.Myklebust@netapp.com \
--cc=faisaman4@gmail.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).