mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (52 commits) split invalidate_inodes() fs: skip I_FREEING inodes in writeback_sb_inodes fs: fold invalidate_list into invalidate_inodes fs: do not drop inode_lock in dispose_list fs: inode split IO and LRU lists fs: switch bdev inode bdi's correctly fs: fix buffer invalidation in invalidate_list fsnotify: use dget_parent smbfs: use dget_parent exportfs: use dget_parent fs: use RCU read side protection in d_validate fs: clean up dentry lru modification fs: split __shrink_dcache_sb fs: improve DCACHE_REFERENCED usage fs: use percpu counter for nr_dentry and nr_dentry_unused fs: simplify __d_free fs: take dcache_lock inside __d_path fs: do not assign default i_ino in new_inode fs: introduce a per-cpu last_ino allocator new helper: ihold() ...
This commit is contained in:
commit
426e1f5cec
118 changed files with 851 additions and 689 deletions
|
|
@ -1580,6 +1580,7 @@ xfs_mapping_buftarg(
|
|||
XFS_BUFTARG_NAME(btp));
|
||||
return ENOMEM;
|
||||
}
|
||||
inode->i_ino = get_next_ino();
|
||||
inode->i_mode = S_IFBLK;
|
||||
inode->i_bdev = bdev;
|
||||
inode->i_rdev = bdev->bd_dev;
|
||||
|
|
|
|||
|
|
@ -317,7 +317,7 @@ xfs_vn_link(
|
|||
if (unlikely(error))
|
||||
return -error;
|
||||
|
||||
atomic_inc(&inode->i_count);
|
||||
ihold(inode);
|
||||
d_instantiate(dentry, inode);
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -760,7 +760,9 @@ xfs_setup_inode(
|
|||
|
||||
inode->i_ino = ip->i_ino;
|
||||
inode->i_state = I_NEW;
|
||||
inode_add_to_lists(ip->i_mount->m_super, inode);
|
||||
|
||||
inode_sb_list_add(inode);
|
||||
insert_inode_hash(inode);
|
||||
|
||||
inode->i_mode = ip->i_d.di_mode;
|
||||
inode->i_nlink = ip->i_d.di_nlink;
|
||||
|
|
|
|||
|
|
@ -576,7 +576,7 @@ xfs_max_file_offset(
|
|||
|
||||
/* Figure out maximum filesize, on Linux this can depend on
|
||||
* the filesystem blocksize (on 32 bit platforms).
|
||||
* __block_prepare_write does this in an [unsigned] long...
|
||||
* __block_write_begin does this in an [unsigned] long...
|
||||
* page->index << (PAGE_CACHE_SHIFT - bbits)
|
||||
* So, for page sized blocks (4K on 32 bit platforms),
|
||||
* this wraps at around 8Tb (hence MAX_LFS_FILESIZE which is
|
||||
|
|
|
|||
|
|
@ -500,7 +500,7 @@ void xfs_mark_inode_dirty_sync(xfs_inode_t *);
|
|||
#define IHOLD(ip) \
|
||||
do { \
|
||||
ASSERT(atomic_read(&VFS_I(ip)->i_count) > 0) ; \
|
||||
atomic_inc(&(VFS_I(ip)->i_count)); \
|
||||
ihold(VFS_I(ip)); \
|
||||
trace_xfs_ihold(ip, _THIS_IP_); \
|
||||
} while (0)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue