Re: [PATCH v2 04/10] locks: move flock locks to file_lock_context

2015-01-09 Thread Jeff Layton
On Fri, 9 Jan 2015 06:31:55 -0800 Christoph Hellwig wrote: > > void ceph_count_locks(struct inode *inode, int *fcntl_count, int > > *flock_count) > > { > > struct file_lock *lock; > > + struct file_lock_context *ctx; > > > > *fcntl_count = 0; > > *flock_count = 0; > > > > +

Re: [PATCH v2 04/10] locks: move flock locks to file_lock_context

2015-01-09 Thread Christoph Hellwig
> void ceph_count_locks(struct inode *inode, int *fcntl_count, int > *flock_count) > { > struct file_lock *lock; > + struct file_lock_context *ctx; > > *fcntl_count = 0; > *flock_count = 0; > > + spin_lock(&inode->i_lock); Seems like moving the locking around is un

[PATCH v2 04/10] locks: move flock locks to file_lock_context

2015-01-08 Thread Jeff Layton
Signed-off-by: Jeff Layton --- fs/ceph/locks.c | 28 --- fs/ceph/mds_client.c | 4 fs/locks.c | 53 +--- fs/nfs/delegation.c | 18 -- fs/nfs/nfs4state.c | 42 +++