diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-02-17 17:08:58 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-17 17:08:58 -0500 |
| commit | 80c20d543d142ee54ec85259b77aaf0b83c32db5 (patch) | |
| tree | 364017b2c001939bbb645dcc20d565c1f71b13a8 /fs/ocfs2/export.c | |
| parent | d6a2d9b800276140abf352908abbd0c240890692 (diff) | |
| parent | b72c7d543589736d43da531566490dd31572f5ca (diff) | |
Merge branch 'omap-fixes-for-linus' into omap-for-linus
Diffstat (limited to 'fs/ocfs2/export.c')
| -rw-r--r-- | fs/ocfs2/export.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/export.c b/fs/ocfs2/export.c index 15713cbb865c..19ad145d2af3 100644 --- a/fs/ocfs2/export.c +++ b/fs/ocfs2/export.c | |||
| @@ -239,7 +239,7 @@ static int ocfs2_encode_fh(struct dentry *dentry, u32 *fh_in, int *max_len, | |||
| 239 | mlog(0, "Encoding parent: blkno: %llu, generation: %u\n", | 239 | mlog(0, "Encoding parent: blkno: %llu, generation: %u\n", |
| 240 | (unsigned long long)blkno, generation); | 240 | (unsigned long long)blkno, generation); |
| 241 | } | 241 | } |
| 242 | 242 | ||
| 243 | *max_len = len; | 243 | *max_len = len; |
| 244 | 244 | ||
| 245 | bail: | 245 | bail: |