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

Commit 4836e300 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: (39 commits)
  [PATCH] fix RLIM_NOFILE handling
  [PATCH] get rid of corner case in dup3() entirely
  [PATCH] remove remaining namei_{32,64}.h crap
  [PATCH] get rid of indirect users of namei.h
  [PATCH] get rid of __user_path_lookup_open
  [PATCH] f_count may wrap around
  [PATCH] dup3 fix
  [PATCH] don't pass nameidata to __ncp_lookup_validate()
  [PATCH] don't pass nameidata to gfs2_lookupi()
  [PATCH] new (local) helper: user_path_parent()
  [PATCH] sanitize __user_walk_fd() et.al.
  [PATCH] preparation to __user_walk_fd cleanup
  [PATCH] kill nameidata passing to permission(), rename to inode_permission()
  [PATCH] take noexec checks to very few callers that care
  Re: [PATCH 3/6] vfs: open_exec cleanup
  [patch 4/4] vfs: immutable inode checking cleanup
  [patch 3/4] fat: dont call notify_change
  [patch 2/4] vfs: utimes cleanup
  [patch 1/4] vfs: utimes: move owner check into inode_change_ok()
  [PATCH] vfs: use kstrdup() and check failing allocation
  ...
parents 5c7c204a 4e1e018e

arch/alpha/kernel/osf_sys.c

+5 −5
Original line number Diff line number Diff line
@@ -253,15 +253,15 @@ do_osf_statfs(struct dentry * dentry, struct osf_statfs __user *buffer, 
}



asmlinkage int

osf_statfs(char __user *path, struct osf_statfs __user *buffer, unsigned long bufsiz)

osf_statfs(char __user *pathname, struct osf_statfs __user *buffer, unsigned long bufsiz)

{

	struct nameidata nd;

	struct path path;

	int retval;



	retval = user_path_walk(path, &nd);

	retval = user_path(pathname, &path);

	if (!retval) {

		retval = do_osf_statfs(nd.path.dentry, buffer, bufsiz);

		path_put(&nd.path);

		retval = do_osf_statfs(path.dentry, buffer, bufsiz);

		path_put(&path);

	}

	return retval;

}

arch/parisc/hpux/sys_hpux.c

+5 −5
Original line number Diff line number Diff line
@@ -210,19 +210,19 @@ static int vfs_statfs_hpux(struct dentry *dentry, struct hpux_statfs *buf) 
}



/* hpux statfs */

asmlinkage long hpux_statfs(const char __user *path,

asmlinkage long hpux_statfs(const char __user *pathname,

						struct hpux_statfs __user *buf)

{

	struct nameidata nd;

	struct path path;

	int error;



	error = user_path_walk(path, &nd);

	error = user_path(pathname, &path);

	if (!error) {

		struct hpux_statfs tmp;

		error = vfs_statfs_hpux(nd.path.dentry, &tmp);

		error = vfs_statfs_hpux(path.dentry, &tmp);

		if (!error && copy_to_user(buf, &tmp, sizeof(tmp)))

			error = -EFAULT;

		path_put(&nd.path);

		path_put(&path);

	}

	return error;

}

drivers/net/ppp_generic.c

+3 −3
Original line number Diff line number Diff line
@@ -581,12 +581,12 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
			if (file == ppp->owner)

				ppp_shutdown_interface(ppp);

		}

		if (atomic_read(&file->f_count) <= 2) {

		if (atomic_long_read(&file->f_count) <= 2) {

			ppp_release(NULL, file);

			err = 0;

		} else

			printk(KERN_DEBUG "PPPIOCDETACH file->f_count=%d\n",

			       atomic_read(&file->f_count));

			printk(KERN_DEBUG "PPPIOCDETACH file->f_count=%ld\n",

			       atomic_long_read(&file->f_count));

		unlock_kernel();

		return err;

	}

fs/affs/file.c

+0 −4
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ const struct inode_operations affs_file_inode_operations = { 
static int

affs_file_open(struct inode *inode, struct file *filp)

{

	if (atomic_read(&filp->f_count) != 1)

		return 0;

	pr_debug("AFFS: open(%lu,%d)\n",

		 inode->i_ino, atomic_read(&AFFS_I(inode)->i_opencnt));

	atomic_inc(&AFFS_I(inode)->i_opencnt);
@@ -57,8 +55,6 @@ affs_file_open(struct inode *inode, struct file *filp) 
static int

affs_file_release(struct inode *inode, struct file *filp)

{

	if (atomic_read(&filp->f_count) != 0)

		return 0;

	pr_debug("AFFS: release(%lu, %d)\n",

		 inode->i_ino, atomic_read(&AFFS_I(inode)->i_opencnt));

fs/afs/internal.h

+1 −3
Original line number Diff line number Diff line
@@ -469,8 +469,6 @@ extern bool afs_cm_incoming_call(struct afs_call *); 
extern const struct inode_operations afs_dir_inode_operations;

extern const struct file_operations afs_dir_file_operations;



extern int afs_permission(struct inode *, int, struct nameidata *);



/*

 * file.c

 */
@@ -605,7 +603,7 @@ extern void afs_clear_permits(struct afs_vnode *); 
extern void afs_cache_permit(struct afs_vnode *, struct key *, long);

extern void afs_zap_permits(struct rcu_head *);

extern struct key *afs_request_key(struct afs_cell *);

extern int afs_permission(struct inode *, int, struct nameidata *);

extern int afs_permission(struct inode *, int);



/*

 * server.c