From: Christoph Hellwig <hch@infradead.org>
To: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
Linus Torvalds <torvalds@linux-foundation.org>,
Bryan Schumaker <bjschuma@netapp.com>,
linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] locks: remove fl_copy_lock lock_manager operation
Date: Sun, 31 Oct 2010 08:35:31 -0400 [thread overview]
Message-ID: <20101031123531.GB4520@infradead.org> (raw)
In-Reply-To: <20101031123419.GA4491@infradead.org>
This one was only used for a nasty hack in nfsd, which has recently
been removed.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Index: linux-2.6/fs/locks.c
===================================================================
--- linux-2.6.orig/fs/locks.c 2010-10-31 07:10:07.649004084 -0400
+++ linux-2.6/fs/locks.c 2010-10-31 07:34:10.102255587 -0400
@@ -235,11 +235,8 @@ static void locks_copy_private(struct fi
fl->fl_ops->fl_copy_lock(new, fl);
new->fl_ops = fl->fl_ops;
}
- if (fl->fl_lmops) {
- if (fl->fl_lmops->fl_copy_lock)
- fl->fl_lmops->fl_copy_lock(new, fl);
+ if (fl->fl_lmops)
new->fl_lmops = fl->fl_lmops;
- }
}
/*
Index: linux-2.6/Documentation/filesystems/Locking
===================================================================
--- linux-2.6.orig/Documentation/filesystems/Locking 2010-10-31 07:34:13.269012536 -0400
+++ linux-2.6/Documentation/filesystems/Locking 2010-10-31 07:34:20.567292713 -0400
@@ -322,7 +322,6 @@ fl_release_private: yes yes
prototypes:
int (*fl_compare_owner)(struct file_lock *, struct file_lock *);
void (*fl_notify)(struct file_lock *); /* unblock callback */
- void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
void (*fl_release_private)(struct file_lock *);
void (*fl_break)(struct file_lock *); /* break_lease callback */
@@ -330,7 +329,6 @@ locking rules:
BKL may block
fl_compare_owner: yes no
fl_notify: yes no
-fl_copy_lock: yes no
fl_release_private: yes yes
fl_break: yes no
Index: linux-2.6/include/linux/fs.h
===================================================================
--- linux-2.6.orig/include/linux/fs.h 2010-10-31 07:33:13.131262640 -0400
+++ linux-2.6/include/linux/fs.h 2010-10-31 07:33:25.959005833 -0400
@@ -1056,7 +1056,6 @@ struct lock_manager_operations {
int (*fl_compare_owner)(struct file_lock *, struct file_lock *);
void (*fl_notify)(struct file_lock *); /* unblock callback */
int (*fl_grant)(struct file_lock *, struct file_lock *, int);
- void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
void (*fl_release_private)(struct file_lock *);
void (*fl_break)(struct file_lock *);
int (*fl_mylease)(struct file_lock *, struct file_lock *);
next prev parent reply other threads:[~2010-10-31 12:35 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-26 16:45 nfsd changes for 2.6.37 J. Bruce Fields
2010-10-26 17:22 ` J. Bruce Fields
2010-10-26 17:39 ` Linus Torvalds
2010-10-26 17:46 ` J. Bruce Fields
2010-10-26 20:18 ` Arnd Bergmann
2010-10-26 20:35 ` Bryan Schumaker
2010-10-26 20:55 ` Arnd Bergmann
2010-10-26 21:02 ` Linus Torvalds
2010-10-26 21:24 ` J. Bruce Fields
2010-10-26 21:37 ` Linus Torvalds
2010-10-26 21:44 ` J. Bruce Fields
2010-10-26 22:11 ` J. Bruce Fields
2010-10-26 22:41 ` J. Bruce Fields
2010-10-27 7:21 ` Arnd Bergmann
2010-10-27 8:39 ` Christoph Hellwig
2010-10-27 13:39 ` J. Bruce Fields
2010-10-27 13:46 ` Arnd Bergmann
2010-10-27 14:55 ` J. Bruce Fields
2010-10-27 14:59 ` Christoph Hellwig
2010-10-27 15:16 ` J. Bruce Fields
2010-10-27 15:19 ` Christoph Hellwig
2010-10-27 15:23 ` Arnd Bergmann
2010-10-27 15:28 ` J. Bruce Fields
2010-10-27 15:31 ` Christoph Hellwig
2010-10-27 16:12 ` Linus Torvalds
2010-10-27 16:46 ` J. Bruce Fields
2010-10-27 17:32 ` Linus Torvalds
2010-10-27 17:40 ` J. Bruce Fields
2010-10-27 18:20 ` Arnd Bergmann
2010-10-27 18:42 ` Linus Torvalds
2010-10-27 18:43 ` Linus Torvalds
2010-10-27 19:48 ` Arnd Bergmann
2010-10-27 20:01 ` J. Bruce Fields
2010-10-27 20:20 ` Arnd Bergmann
2010-10-27 20:24 ` J. Bruce Fields
2010-10-30 21:25 ` J. Bruce Fields
2010-10-30 21:31 ` [PATCH 1/4] locks: prevent ENOMEM on lease unlock J. Bruce Fields
2010-10-30 21:31 ` [PATCH 2/4] locks: fix leaks on setlease errors J. Bruce Fields
2010-10-31 11:10 ` Christoph Hellwig
2010-11-01 17:24 ` J. Bruce Fields
2010-11-01 17:41 ` Christoph Hellwig
2010-11-01 18:34 ` J. Bruce Fields
2010-10-30 21:31 ` [PATCH 3/4] locks: fix setlease methods to free passed-in lock J. Bruce Fields
2010-10-30 21:31 ` [PATCH 4/4] nfsd4: initialize delegation pointer to lease J. Bruce Fields
2010-10-31 2:04 ` Christoph Hellwig
2010-10-31 3:04 ` J. Bruce Fields
2010-10-30 21:40 ` nfsd changes for 2.6.37 Arnd Bergmann
2010-10-31 2:07 ` Christoph Hellwig
2010-10-31 3:05 ` J. Bruce Fields
2010-10-31 12:34 ` Christoph Hellwig
2010-10-31 12:35 ` [PATCH 1/2] locks: let the caller free file_lock on ->setlease failure Christoph Hellwig
2010-11-03 20:41 ` J. Bruce Fields
2010-11-04 1:40 ` J. Bruce Fields
2010-11-04 1:41 ` J. Bruce Fields
2010-11-06 19:03 ` Christoph Hellwig
2010-11-06 19:03 ` Christoph Hellwig
2010-11-08 16:10 ` J. Bruce Fields
2010-10-31 12:35 ` Christoph Hellwig [this message]
2010-11-01 15:02 ` nfsd changes for 2.6.37 J. Bruce Fields
2010-11-06 19:04 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101031123531.GB4520@infradead.org \
--to=hch@infradead.org \
--cc=arnd@arndb.de \
--cc=bfields@fieldses.org \
--cc=bjschuma@netapp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®