Commit c1e62b8f authored by Jeff Layton's avatar Jeff Layton
Browse files

locks: pass the cmd value to fcntl_getlk/getlk64 



Once we introduce file private locks, we'll need to know what cmd value
was used, as that affects the ownership and whether a conflict would
arise.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
parent 3fd80cdd

fs/fcntl.c

+2 −2
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg, 
		err = setfl(fd, filp, arg);

		break;

	case F_GETLK:

		err = fcntl_getlk(filp, (struct flock __user *) arg);

		err = fcntl_getlk(filp, cmd, (struct flock __user *) arg);

		break;

	case F_SETLK:

	case F_SETLKW:
@@ -389,7 +389,7 @@ SYSCALL_DEFINE3(fcntl64, unsigned int, fd, unsigned int, cmd, 
	

	switch (cmd) {

		case F_GETLK64:

			err = fcntl_getlk64(f.file, (struct flock64 __user *) arg);

			err = fcntl_getlk64(f.file, cmd, (struct flock64 __user *) arg);

			break;

		case F_SETLK64:

		case F_SETLKW64:

fs/locks.c

+2 −2
Original line number Diff line number Diff line
@@ -1898,7 +1898,7 @@ static void posix_lock_to_flock64(struct flock64 *flock, struct file_lock *fl) 
/* Report the first existing lock that would conflict with l.

 * This implements the F_GETLK command of fcntl().

 */

int fcntl_getlk(struct file *filp, struct flock __user *l)

int fcntl_getlk(struct file *filp, unsigned int cmd, struct flock __user *l)

{

	struct file_lock file_lock;

	struct flock flock;
@@ -2066,7 +2066,7 @@ int fcntl_setlk(unsigned int fd, struct file *filp, unsigned int cmd, 
/* Report the first existing lock that would conflict with l.

 * This implements the F_GETLK command of fcntl().

 */

int fcntl_getlk64(struct file *filp, struct flock64 __user *l)

int fcntl_getlk64(struct file *filp, unsigned int cmd, struct flock64 __user *l)

{

	struct file_lock file_lock;

	struct flock64 flock;

include/linux/fs.h

+6 −4
Original line number Diff line number Diff line
@@ -993,12 +993,12 @@ struct file_lock { 
extern void send_sigio(struct fown_struct *fown, int fd, int band);



#ifdef CONFIG_FILE_LOCKING

extern int fcntl_getlk(struct file *, struct flock __user *);

extern int fcntl_getlk(struct file *, unsigned int, struct flock __user *);

extern int fcntl_setlk(unsigned int, struct file *, unsigned int,

			struct flock __user *);



#if BITS_PER_LONG == 32

extern int fcntl_getlk64(struct file *, struct flock64 __user *);

extern int fcntl_getlk64(struct file *, unsigned int, struct flock64 __user *);

extern int fcntl_setlk64(unsigned int, struct file *, unsigned int,

			struct flock64 __user *);

#endif
@@ -1031,7 +1031,8 @@ extern int lease_modify(struct file_lock **, int); 
extern int lock_may_read(struct inode *, loff_t start, unsigned long count);

extern int lock_may_write(struct inode *, loff_t start, unsigned long count);

#else /* !CONFIG_FILE_LOCKING */

static inline int fcntl_getlk(struct file *file, struct flock __user *user)

static inline int fcntl_getlk(struct file *file, unsigned int cmd,

			      struct flock __user *user)

{

	return -EINVAL;

}
@@ -1043,7 +1044,8 @@ static inline int fcntl_setlk(unsigned int fd, struct file *file, 
}



#if BITS_PER_LONG == 32

static inline int fcntl_getlk64(struct file *file, struct flock64 __user *user)

static inline int fcntl_getlk64(struct file *file, unsigned int cmd,

				struct flock64 __user *user)

{

	return -EINVAL;

}