diff options
| author | Chris Mason | 2011-12-15 19:43:49 +0100 |
|---|---|---|
| committer | Chris Mason | 2011-12-15 19:43:49 +0100 |
| commit | 567a45e917343c952806bb9f5c19aab0139bd519 (patch) | |
| tree | b1d6dac31a3a2836d24662139f21bb1ddc2522d3 /fs/btrfs/super.c | |
| parent | Btrfs: deal with NULL srv_rsv in the delalloc inode reservation code (diff) | |
| parent | Btrfs: only set cache_generation if we setup the block group (diff) | |
| download | kernel-qcow2-linux-567a45e917343c952806bb9f5c19aab0139bd519.tar.gz kernel-qcow2-linux-567a45e917343c952806bb9f5c19aab0139bd519.tar.xz kernel-qcow2-linux-567a45e917343c952806bb9f5c19aab0139bd519.zip | |
Merge branch 'for-chris' of http://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work into integration
Conflicts:
fs/btrfs/inode.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/super.c')
| -rw-r--r-- | fs/btrfs/super.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 41495dce4db0..34a8b6112ea4 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -41,6 +41,7 @@ #include <linux/slab.h> #include <linux/cleancache.h> #include <linux/mnt_namespace.h> +#include <linux/ratelimit.h> #include "compat.h" #include "delayed-inode.h" #include "ctree.h" @@ -1297,6 +1298,16 @@ static int btrfs_unfreeze(struct super_block *sb) return 0; } +static void btrfs_fs_dirty_inode(struct inode *inode, int flags) +{ + int ret; + + ret = btrfs_dirty_inode(inode); + if (ret) + printk_ratelimited(KERN_ERR "btrfs: fail to dirty inode %Lu " + "error %d\n", btrfs_ino(inode), ret); +} + static const struct super_operations btrfs_super_ops = { .drop_inode = btrfs_drop_inode, .evict_inode = btrfs_evict_inode, @@ -1304,7 +1315,7 @@ static const struct super_operations btrfs_super_ops = { .sync_fs = btrfs_sync_fs, .show_options = btrfs_show_options, .write_inode = btrfs_write_inode, - .dirty_inode = btrfs_dirty_inode, + .dirty_inode = btrfs_fs_dirty_inode, .alloc_inode = btrfs_alloc_inode, .destroy_inode = btrfs_destroy_inode, .statfs = btrfs_statfs, |