diff options
| author | Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> | 2009-05-16 08:49:10 -0400 |
|---|---|---|
| committer | Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> | 2009-06-10 10:41:09 -0400 |
| commit | dda54f4b872512eba484c38631bd6ae5b5716f41 (patch) | |
| tree | bf9bf0b18c9cf232fa34a6f3de08e90a658259f2 | |
| parent | d97a51a7e3c298d9899ea91165dfa0783fa5cc5c (diff) | |
nilfs2: add sufile function that can modify multiple segment usages
This is a preparation for the later cleanup patch ("nilfs2: remove
list of freeing segments").
This adds nilfs_sufile_updatev() to sufile, which can modify multiple
segment usages at a time.
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
| -rw-r--r-- | fs/nilfs2/sufile.c | 97 | ||||
| -rw-r--r-- | fs/nilfs2/sufile.h | 4 |
2 files changed, 101 insertions, 0 deletions
diff --git a/fs/nilfs2/sufile.c b/fs/nilfs2/sufile.c index 98e68677f045..da127325fdaa 100644 --- a/fs/nilfs2/sufile.c +++ b/fs/nilfs2/sufile.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | * | 19 | * |
| 20 | * Written by Koji Sato <koji@osrg.net>. | 20 | * Written by Koji Sato <koji@osrg.net>. |
| 21 | * Rivised by Ryusuke Konishi <ryusuke@osrg.net>. | ||
| 21 | */ | 22 | */ |
| 22 | 23 | ||
| 23 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| @@ -108,6 +109,102 @@ static void nilfs_sufile_mod_counter(struct buffer_head *header_bh, | |||
| 108 | nilfs_mdt_mark_buffer_dirty(header_bh); | 109 | nilfs_mdt_mark_buffer_dirty(header_bh); |
| 109 | } | 110 | } |
| 110 | 111 | ||
| 112 | /** | ||
| 113 | * nilfs_sufile_updatev - modify multiple segment usages at a time | ||
| 114 | * @sufile: inode of segment usage file | ||
| 115 | * @segnumv: array of segment numbers | ||
| 116 | * @nsegs: size of @segnumv array | ||
| 117 | * @create: creation flag | ||
| 118 | * @ndone: place to store number of modified segments on @segnumv | ||
| 119 | * @dofunc: primitive operation for the update | ||
| 120 | * | ||
| 121 | * Description: nilfs_sufile_updatev() repeatedly calls @dofunc | ||
| 122 | * against the given array of segments. The @dofunc is called with | ||
| 123 | * buffers of a header block and the sufile block in which the target | ||
| 124 | * segment usage entry is contained. If @ndone is given, the number | ||
| 125 | * of successfully modified segments from the head is stored in the | ||
| 126 | * place @ndone points to. | ||
| 127 | * | ||
| 128 | * Return Value: On success, zero is returned. On error, one of the | ||
| 129 | * following negative error codes is returned. | ||
| 130 | * | ||
| 131 | * %-EIO - I/O error. | ||
| 132 | * | ||
| 133 | * %-ENOMEM - Insufficient amount of memory available. | ||
| 134 | * | ||
| 135 | * %-ENOENT - Given segment usage is in hole block (may be returned if | ||
| 136 | * @create is zero) | ||
| 137 | * | ||
| 138 | * %-EINVAL - Invalid segment usage number | ||
| 139 | */ | ||
| 140 | int nilfs_sufile_updatev(struct inode *sufile, __u64 *segnumv, size_t nsegs, | ||
| 141 | int create, size_t *ndone, | ||
| 142 | void (*dofunc)(struct inode *, __u64, | ||
| 143 | struct buffer_head *, | ||
| 144 | struct buffer_head *)) | ||
| 145 | { | ||
| 146 | struct buffer_head *header_bh, *bh; | ||
| 147 | unsigned long blkoff, prev_blkoff; | ||
| 148 | __u64 *seg; | ||
| 149 | size_t nerr = 0, n = 0; | ||
| 150 | int ret = 0; | ||
| 151 | |||
| 152 | if (unlikely(nsegs == 0)) | ||
| 153 | goto out; | ||
| 154 | |||
| 155 | down_write(&NILFS_MDT(sufile)->mi_sem); | ||
| 156 | for (seg = segnumv; seg < segnumv + nsegs; seg++) { | ||
| 157 | if (unlikely(*seg >= nilfs_sufile_get_nsegments(sufile))) { | ||
| 158 | printk(KERN_WARNING | ||
| 159 | "%s: invalid segment number: %llu\n", __func__, | ||
| 160 | (unsigned long long)*seg); | ||
| 161 | nerr++; | ||
| 162 | } | ||
| 163 | } | ||
| 164 | if (nerr > 0) { | ||
| 165 | ret = -EINVAL; | ||
| 166 | goto out_sem; | ||
| 167 | } | ||
| 168 | |||
| 169 | ret = nilfs_sufile_get_header_block(sufile, &header_bh); | ||
| 170 | if (ret < 0) | ||
| 171 | goto out_sem; | ||
| 172 | |||
| 173 | seg = segnumv; | ||
| 174 | blkoff = nilfs_sufile_get_blkoff(sufile, *seg); | ||
| 175 | ret = nilfs_mdt_get_block(sufile, blkoff, create, NULL, &bh); | ||
| 176 | if (ret < 0) | ||
| 177 | goto out_header; | ||
| 178 | |||
| 179 | for (;;) { | ||
| 180 | dofunc(sufile, *seg, header_bh, bh); | ||
| 181 | |||
| 182 | if (++seg >= segnumv + nsegs) | ||
| 183 | break; | ||
| 184 | prev_blkoff = blkoff; | ||
| 185 | blkoff = nilfs_sufile_get_blkoff(sufile, *seg); | ||
| 186 | if (blkoff == prev_blkoff) | ||
| 187 | continue; | ||
| 188 | |||
| 189 | /* get different block */ | ||
| 190 | brelse(bh); | ||
| 191 | ret = nilfs_mdt_get_block(sufile, blkoff, create, NULL, &bh); | ||
| 192 | if (unlikely(ret < 0)) | ||
| 193 | goto out_header; | ||
| 194 | } | ||
| 195 | brelse(bh); | ||
| 196 | |||
| 197 | out_header: | ||
| 198 | n = seg - segnumv; | ||
| 199 | brelse(header_bh); | ||
| 200 | out_sem: | ||
| 201 | up_write(&NILFS_MDT(sufile)->mi_sem); | ||
| 202 | out: | ||
| 203 | if (ndone) | ||
| 204 | *ndone = n; | ||
| 205 | return ret; | ||
| 206 | } | ||
| 207 | |||
| 111 | int nilfs_sufile_update(struct inode *sufile, __u64 segnum, int create, | 208 | int nilfs_sufile_update(struct inode *sufile, __u64 segnum, int create, |
| 112 | void (*dofunc)(struct inode *, __u64, | 209 | void (*dofunc)(struct inode *, __u64, |
| 113 | struct buffer_head *, | 210 | struct buffer_head *, |
diff --git a/fs/nilfs2/sufile.h b/fs/nilfs2/sufile.h index a2e2efd4ade1..e8e26279c261 100644 --- a/fs/nilfs2/sufile.h +++ b/fs/nilfs2/sufile.h | |||
| @@ -46,6 +46,10 @@ int nilfs_sufile_get_ncleansegs(struct inode *, unsigned long *); | |||
| 46 | ssize_t nilfs_sufile_get_suinfo(struct inode *, __u64, struct nilfs_suinfo *, | 46 | ssize_t nilfs_sufile_get_suinfo(struct inode *, __u64, struct nilfs_suinfo *, |
| 47 | size_t); | 47 | size_t); |
| 48 | 48 | ||
| 49 | int nilfs_sufile_updatev(struct inode *, __u64 *, size_t, int, size_t *, | ||
| 50 | void (*dofunc)(struct inode *, __u64, | ||
| 51 | struct buffer_head *, | ||
| 52 | struct buffer_head *)); | ||
| 49 | int nilfs_sufile_update(struct inode *, __u64, int, | 53 | int nilfs_sufile_update(struct inode *, __u64, int, |
| 50 | void (*dofunc)(struct inode *, __u64, | 54 | void (*dofunc)(struct inode *, __u64, |
| 51 | struct buffer_head *, | 55 | struct buffer_head *, |
