From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "J. Bruce Fields" <bfields@fieldses.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@lst.de>
Subject: linux-next: manual merge of the nfsd tree with Linus' tree
Date: Thu, 6 Jan 2011 11:47:17 +1100 [thread overview]
Message-ID: <20110106114717.32cd3a25.sfr@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the nfsd tree got a conflict in
Documentation/filesystems/Locking between commit
b83be6f20a0e468f715b14225c9f897538dfe5ad ("update
Documentation/filesystems/Locking") from Linus' tree and commit
e63eb9375089f9d2041305d04c3f33a194e0e014 ("nfsd4: eliminate lease delete
callback") from the nfsd tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc Documentation/filesystems/Locking
index 33fa3e5,075be12..0000000
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@@ -337,22 -327,17 +337,20 @@@ fl_release_private: maybe n
prototypes:
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_release_private)(struct file_lock *);
void (*fl_break)(struct file_lock *); /* break_lease callback */
+ int (*fl_mylease)(struct file_lock *, struct file_lock *);
+ int (*fl_change)(struct file_lock **, int);
locking rules:
- BKL may block
-fl_compare_owner: yes no
-fl_notify: yes no
-fl_break: yes no
-
- Currently only NFSD and NLM provide instances of this class. None of the
-them block. If you have out-of-tree instances - please, show up. Locking
-in that area will change.
+ file_lock_lock may block
+fl_compare_owner: yes no
+fl_notify: yes no
+fl_grant: no no
- fl_release_private: maybe no
+fl_break: yes no
+fl_mylease: yes no
+fl_change yes no
+
--------------------------- buffer_head -----------------------------------
prototypes:
void (*b_end_io)(struct buffer_head *bh, int uptodate);
next reply other threads:[~2011-01-06 0:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-06 0:47 Stephen Rothwell [this message]
2013-03-01 0:49 linux-next: manual merge of the nfsd tree with Linus' tree Stephen Rothwell
2013-04-03 0:01 Stephen Rothwell
2014-01-29 1:42 Stephen Rothwell
2015-07-30 1:23 Stephen Rothwell
2015-07-30 1:35 ` Trond Myklebust
2015-07-30 2:12 ` J. Bruce Fields
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=20110106114717.32cd3a25.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bfields@fieldses.org \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.