diff options
| author | Miklos Szeredi <mszeredi@redhat.com> | 2020-01-24 09:46:45 +0100 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@redhat.com> | 2020-01-24 09:46:45 +0100 |
| commit | 1346416564f06444ca59778c05607bedb91a991a (patch) | |
| tree | 605888ab1b04c2bf048464bc4e435fd1b5ca020b /fs/overlayfs/super.c | |
| parent | b7bf9908e17c4dc4b80876f299ac03ddf188efd9 (diff) | |
| download | lwn-1346416564f06444ca59778c05607bedb91a991a.tar.gz lwn-1346416564f06444ca59778c05607bedb91a991a.zip | |
ovl: layer is const
The ovl_layer struct is never modified except at initialization.
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/overlayfs/super.c')
| -rw-r--r-- | fs/overlayfs/super.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index dcdcb4e3003a..c795b7498ad2 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -1320,12 +1320,13 @@ static int ovl_get_layers(struct super_block *sb, struct ovl_fs *ofs, { int err; unsigned int i; + struct ovl_layer *layers; err = -ENOMEM; - ofs->layers = kcalloc(numlower + 1, sizeof(struct ovl_layer), - GFP_KERNEL); - if (ofs->layers == NULL) + layers = kcalloc(numlower + 1, sizeof(struct ovl_layer), GFP_KERNEL); + if (!layers) goto out; + ofs->layers = layers; ofs->fs = kcalloc(numlower + 1, sizeof(struct ovl_sb), GFP_KERNEL); if (ofs->fs == NULL) @@ -1334,9 +1335,9 @@ static int ovl_get_layers(struct super_block *sb, struct ovl_fs *ofs, /* idx/fsid 0 are reserved for upper fs even with lower only overlay */ ofs->numfs++; - ofs->layers[0].mnt = ofs->upper_mnt; - ofs->layers[0].idx = 0; - ofs->layers[0].fsid = 0; + layers[0].mnt = ofs->upper_mnt; + layers[0].idx = 0; + layers[0].fsid = 0; ofs->numlayer = 1; /* @@ -1389,11 +1390,11 @@ static int ovl_get_layers(struct super_block *sb, struct ovl_fs *ofs, */ mnt->mnt_flags |= MNT_READONLY | MNT_NOATIME; - ofs->layers[ofs->numlayer].trap = trap; - ofs->layers[ofs->numlayer].mnt = mnt; - ofs->layers[ofs->numlayer].idx = ofs->numlayer; - ofs->layers[ofs->numlayer].fsid = fsid; - ofs->layers[ofs->numlayer].fs = &ofs->fs[fsid]; + layers[ofs->numlayer].trap = trap; + layers[ofs->numlayer].mnt = mnt; + layers[ofs->numlayer].idx = ofs->numlayer; + layers[ofs->numlayer].fsid = fsid; + layers[ofs->numlayer].fs = &ofs->fs[fsid]; ofs->numlayer++; ofs->fs[fsid].is_lower = true; } |