Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10effcb5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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:
  FS: lookup_mnt() is only used in the core fs routines now
  bfs: fix bitmap size argument to find_first_zero_bit()
  fs: Use BUG_ON(!mnt) at dentry_open().
  fs: devpts_pty_new() return -ENOMEM if dentry allocation failed
  nfs: lock() vs unlock() typo
  pstore: fix leaking ->i_private
  introduce sys_syncfs to sync a single file system
  Small typo fix...
  Filesystem: fifo: Fixed coding style issue.
  fs/inode: Fix kernel-doc format for inode_init_owner
  select: remove unused MAX_SELECT_SECONDS
  vfs: cleanup do_vfs_ioctl()
parents c3ca48f0 0f60f240

arch/x86/ia32/ia32entry.S

+1 −0
Original line number Diff line number Diff line
@@ -847,4 +847,5 @@ ia32_sys_call_table: 
	.quad sys_name_to_handle_at

	.quad compat_sys_open_by_handle_at

	.quad compat_sys_clock_adjtime

	.quad sys_syncfs

ia32_syscall_end:

arch/x86/include/asm/unistd_32.h

+2 −1
Original line number Diff line number Diff line
@@ -349,10 +349,11 @@ 
#define __NR_name_to_handle_at	341

#define __NR_open_by_handle_at  342

#define __NR_clock_adjtime	343

#define __NR_syncfs             344



#ifdef __KERNEL__



#define NR_syscalls 344

#define NR_syscalls 345



#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_OLD_READDIR

arch/x86/include/asm/unistd_64.h

+2 −0
Original line number Diff line number Diff line
@@ -675,6 +675,8 @@ __SYSCALL(__NR_name_to_handle_at, sys_name_to_handle_at) 
__SYSCALL(__NR_open_by_handle_at, sys_open_by_handle_at)

#define __NR_clock_adjtime			305

__SYSCALL(__NR_clock_adjtime, sys_clock_adjtime)

#define __NR_syncfs                             306

__SYSCALL(__NR_syncfs, sys_syncfs)



#ifndef __NO_STUBS

#define __ARCH_WANT_OLD_READDIR

arch/x86/kernel/syscall_table_32.S

+1 −0
Original line number Diff line number Diff line
@@ -343,3 +343,4 @@ ENTRY(sys_call_table) 
	.long sys_name_to_handle_at

	.long sys_open_by_handle_at

	.long sys_clock_adjtime

	.long sys_syncfs

fs/bfs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static int bfs_create(struct inode *dir, struct dentry *dentry, int mode, 
	if (!inode)

		return -ENOSPC;

	mutex_lock(&info->bfs_lock);

	ino = find_first_zero_bit(info->si_imap, info->si_lasti);

	ino = find_first_zero_bit(info->si_imap, info->si_lasti + 1);

	if (ino > info->si_lasti) {

		mutex_unlock(&info->bfs_lock);

		iput(inode);