Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 (a57f9a3e) · Commits · 戴 / test

Documentation/filesystems/nilfs2.txt

+8 −4

Original line number	Diff line number	Diff line
		@@ -49,7 +49,10 @@ Mount options
		NILFS2 supports the following mount options:
		(*) == default

		nobarrier Disables barriers.
		barrier(*) This enables/disables the use of write barriers. This
		nobarrier requires an IO stack which can support barriers, and
		if nilfs gets an error on a barrier write, it will
		disable again with a warning.
		errors=continue Keep going on a filesystem error.
		errors=remount-ro(*) Remount the filesystem read-only on an error.
		errors=panic Panic and halt the machine if an error occurs.
		@@ -74,9 +77,10 @@ norecovery Disable recovery of the filesystem on mount.
		This disables every write access on the device for
		read-only mounts or snapshots. This option will fail
		for r/w mounts on an unclean volume.
		discard Issue discard/TRIM commands to the underlying block
		device when blocks are freed. This is useful for SSD
		devices and sparse/thinly-provisioned LUNs.
		discard This enables/disables the use of discard/TRIM commands.
		nodiscard(*) The discard/TRIM commands are sent to the underlying
		block device when blocks are freed. This is useful
		for SSD devices and sparse/thinly-provisioned LUNs.

		NILFS2 usage
		============

fs/nilfs2/bmap.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -26,6 +26,8 @@
		#include "nilfs.h"
		#include "bmap.h"
		#include "sb.h"
		#include "btree.h"
		#include "direct.h"
		#include "btnode.h"
		#include "mdt.h"
		#include "dat.h"
		@@ -533,7 +535,7 @@ void nilfs_bmap_init_gc(struct nilfs_bmap *bmap)

		void nilfs_bmap_init_gcdat(struct nilfs_bmap gcbmap, struct nilfs_bmap bmap)
		{
		memcpy(gcbmap, bmap, sizeof(union nilfs_bmap_union));
		memcpy(gcbmap, bmap, sizeof(*bmap));
		init_rwsem(&gcbmap->b_sem);
		lockdep_set_class(&bmap->b_sem, &nilfs_bmap_dat_lock_key);
		gcbmap->b_inode = &NILFS_BMAP_I(gcbmap)->vfs_inode;
		@@ -541,7 +543,7 @@ void nilfs_bmap_init_gcdat(struct nilfs_bmap gcbmap, struct nilfs_bmap bmap)

		void nilfs_bmap_commit_gcdat(struct nilfs_bmap gcbmap, struct nilfs_bmap bmap)
		{
		memcpy(bmap, gcbmap, sizeof(union nilfs_bmap_union));
		memcpy(bmap, gcbmap, sizeof(*bmap));
		init_rwsem(&bmap->b_sem);
		lockdep_set_class(&bmap->b_sem, &nilfs_bmap_dat_lock_key);
		bmap->b_inode = &NILFS_BMAP_I(bmap)->vfs_inode;

fs/nilfs2/bmap.h

+10 −6

Original line number	Diff line number	Diff line
		@@ -32,11 +32,6 @@

		#define NILFS_BMAP_INVALID_PTR 0

		#define nilfs_bmap_dkey_to_key(dkey) le64_to_cpu(dkey)
		#define nilfs_bmap_key_to_dkey(key) cpu_to_le64(key)
		#define nilfs_bmap_dptr_to_ptr(dptr) le64_to_cpu(dptr)
		#define nilfs_bmap_ptr_to_dptr(ptr) cpu_to_le64(ptr)

		#define nilfs_bmap_keydiff_abs(diff) ((diff) < 0 ? -(diff) : (diff))


		@@ -71,7 +66,7 @@ struct nilfs_bmap_operations {
		int (bop_delete)(struct nilfs_bmap , __u64);
		void (bop_clear)(struct nilfs_bmap );

		int (bop_propagate)(const struct nilfs_bmap , struct buffer_head *);
		int (bop_propagate)(struct nilfs_bmap , struct buffer_head *);
		void (bop_lookup_dirty_buffers)(struct nilfs_bmap ,
		struct list_head *);

		@@ -110,6 +105,7 @@ static inline int nilfs_bmap_is_new_ptr(unsigned long ptr)
		* @b_last_allocated_ptr: last allocated ptr for data block
		* @b_ptr_type: pointer type
		* @b_state: state
		* @b_nchildren_per_block: maximum number of child nodes for non-root nodes
		*/
		struct nilfs_bmap {
		union {
		@@ -123,6 +119,7 @@ struct nilfs_bmap {
		__u64 b_last_allocated_ptr;
		int b_ptr_type;
		int b_state;
		__u16 b_nchildren_per_block;
		};

		/* pointer type */
		@@ -224,6 +221,13 @@ static inline void nilfs_bmap_abort_end_ptr(struct nilfs_bmap *bmap,
		nilfs_dat_abort_end(dat, &req->bpr_req);
		}

		static inline void nilfs_bmap_set_target_v(struct nilfs_bmap *bmap, __u64 key,
		__u64 ptr)
		{
		bmap->b_last_allocated_key = key;
		bmap->b_last_allocated_ptr = ptr;
		}

		__u64 nilfs_bmap_data_get_key(const struct nilfs_bmap *,
		const struct buffer_head *);

fs/nilfs2/bmap_union.h

deleted100644 → 0

+0 −42

Original line number	Diff line number	Diff line
		/*
		* bmap_union.h - NILFS block mapping.
		*
		* Copyright (C) 2006-2008 Nippon Telegraph and Telephone Corporation.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation; either version 2 of the License, or
		* (at your option) any later version.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
		*
		* Written by Koji Sato <koji@osrg.net>.
		*/

		#ifndef _NILFS_BMAP_UNION_H
		#define _NILFS_BMAP_UNION_H

		#include "bmap.h"
		#include "direct.h"
		#include "btree.h"

		/**
		* nilfs_bmap_union -
		* @bi_bmap: bmap structure
		* @bi_btree: direct map structure
		* @bi_direct: B-tree structure
		*/
		union nilfs_bmap_union {
		struct nilfs_bmap bi_bmap;
		struct nilfs_direct bi_direct;
		struct nilfs_btree bi_btree;
		};

		#endif /* _NILFS_BMAP_UNION_H */

fs/nilfs2/btnode.c

+18 −5

Original line number	Diff line number	Diff line
		@@ -96,10 +96,12 @@ nilfs_btnode_create_block(struct address_space *btnc, __u64 blocknr)
		}

		int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr,
		sector_t pblocknr, struct buffer_head **pbh)
		sector_t pblocknr, int mode,
		struct buffer_head *pbh, sector_t submit_ptr)
		{
		struct buffer_head *bh;
		struct inode *inode = NILFS_BTNC_I(btnc);
		struct page *page;
		int err;

		bh = nilfs_grab_buffer(inode, btnc, blocknr, 1 << BH_NILFS_Node);
		@@ -107,6 +109,7 @@ int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr,
		return -ENOMEM;

		err = -EEXIST; /* internal code */
		page = bh->b_page;

		if (buffer_uptodate(bh) \|\| buffer_dirty(bh))
		goto found;
		@@ -125,7 +128,16 @@ int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr,
		}
		}
		}

		if (mode == READA) {
		if (pblocknr != *submit_ptr + 1 \|\| !trylock_buffer(bh)) {
		err = -EBUSY; /* internal code */
		brelse(bh);
		goto out_locked;
		}
		} else { /* mode == READ */
		lock_buffer(bh);
		}
		if (buffer_uptodate(bh)) {
		unlock_buffer(bh);
		err = -EEXIST; /* internal code */
		@@ -136,15 +148,16 @@ int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr,
		bh->b_blocknr = pblocknr; /* set block address for read */
		bh->b_end_io = end_buffer_read_sync;
		get_bh(bh);
		submit_bh(READ, bh);
		submit_bh(mode, bh);
		bh->b_blocknr = blocknr; /* set back to the given block address */
		*submit_ptr = pblocknr;
		err = 0;
		found:
		*pbh = bh;

		out_locked:
		unlock_page(bh->b_page);
		page_cache_release(bh->b_page);
		unlock_page(page);
		page_cache_release(page);
		return err;
		}

Admin message